- wprintf("<INPUT TYPE=\"submit\" NAME=\"select_button\" VALUE=\"%s\" ", _("Select"));
- wprintf("onClick=\"AddContactsToTarget($('%s'),$('whichaddr'));\">", bstr("target_input"));
+ wprintf("%s: ", _("Add"));
+
+ num_targets = num_tokens(bstr("target_input"), '|');
+ for (i=0; i<num_targets; i+=2) {
+ extract_token(target_id, bstr("target_input"), i, '|', sizeof target_id);
+ extract_token(target_label, bstr("target_input"), i+1, '|', sizeof target_label);
+ wprintf("<INPUT TYPE=\"submit\" NAME=\"select_button\" VALUE=\"%s\" ", target_label);
+ wprintf("onClick=\"AddContactsToTarget($('%s'),$('whichaddr'));\">", target_id);
+ }
+
+ /* This 'close window' button works. Omitting it because we already have a close button
+ * in the upper right corner, and this one takes up space.
+ *