Index: tokens.php
===================================================================
--- tokens.php	(revision 9887)
+++ tokens.php	(working copy)
@@ -1622,6 +1622,10 @@
             }
             if ($ctcount > $emcount)
             {
+                $i = 0;
+                while($i < $maxemails)
+                { array_shift($tokenids); $i++; }
+                $tids = '|'.implode('|',$tokenids);
                 $lefttosend = $ctcount-$maxemails;
                 $tokenoutput .= "</ul>\n"
                 ."<div class='warningheader'>".$clang->gT("Warning")."</div><br />\n"
@@ -1634,7 +1638,8 @@
                 ."<input type='hidden' name='subaction' value=\"email\" />\n"
                 ."<input type='hidden' name='action' value=\"tokens\" />\n"
                 ."<input type='hidden' name='bypassbademails' value=\"".$_POST['bypassbademails']."\" />\n"
-                ."<input type='hidden' name='sid' value=\"{$surveyid}\" />\n";
+                ."<input type='hidden' name='sid' value=\"{$surveyid}\" />\n"
+                ."<input type='hidden' name='tids' value=\"{$tids}\" />\n";
                 foreach ($surveylangs as $language)
                 {
                     $message = html_escape($_POST['message_'.$language]);