### Eclipse Workspace Patch 1.0
#P mimemail
Index: includes/mimemail.rules_forms.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mimemail/includes/mimemail.rules_forms.inc,v
retrieving revision 1.3.2.3
diff -u -r1.3.2.3 mimemail.rules_forms.inc
--- includes/mimemail.rules_forms.inc	6 Nov 2010 18:13:41 -0000	1.3.2.3
+++ includes/mimemail.rules_forms.inc	9 Nov 2010 11:03:56 -0000
@@ -86,25 +86,25 @@
   $cc = explode(',', $form_state['values']['settings']['cc']);
   $bcc = explode(',', $form_state['values']['settings']['bcc']);
 
-  if (!empty($from) && !valid_email_address($from)) {
-      form_set_error('settings][from', t('Please enter a valid e-mail address for sender or leave it empty to use the site-wide configured address.'));
+  if (!empty($from) && !valid_email_address($from) && (strpos($from, '[') === FALSE || strpos($from, ':') === FALSE || strpos($from, ']') === FALSE)) {
+      form_set_error('settings][from', t('Please enter a valid e-mail address or token for sender. You may leave it empty to use the site-wide configured address.'));
   }
   foreach ($to as $recipient) {
     $recipient = trim($recipient);
-    if (!valid_email_address($recipient)) {
-      form_set_error('settings][to', t('Please enter a valid e-mail address for recipient.'));
+    if (!valid_email_address($recipient) && (strpos($recipient, '[') === FALSE || strpos($recipient, ':') === FALSE || strpos($recipient, ']') === FALSE)) {
+      form_set_error('settings][to', t('Please enter a valid e-mail address or token for recipient.'));
     }
   }
   foreach ($cc as $recipient) {
     $recipient = trim($recipient);
-    if (!empty($recipient) &&!valid_email_address($recipient)) {
-      form_set_error('settings][cc', t('Please enter valid e-mail address(es) for carbon copy (CC) recipient.'));
+    if (!empty($recipient) && !valid_email_address($recipient) && (strpos($recipient, '[') === FALSE || strpos($recipient, ':') === FALSE || strpos($recipient, ']') === FALSE)) {
+      form_set_error('settings][cc', t('Please enter valid e-mail address(es) or token(s) for carbon copy (CC) recipient.'));
     }
   }
   foreach ($bcc as $recipient) {
     $recipient = trim($recipient);
-    if (!empty($recipient) &&!valid_email_address($recipient)) {
-      form_set_error('settings][bcc', t('Please enter valid e-mail address(es) for blind carbon copy (BCC) recipient.'));
+    if (!empty($recipient) &&!valid_email_address($recipient) && (strpos($recipient, '[') === FALSE || strpos($recipient, ':') === FALSE || strpos($recipient, ']') === FALSE)) {
+      form_set_error('settings][bcc', t('Please enter valid e-mail address(es) or token(s) for blind carbon copy (BCC) recipient.'));
     }
   }
 }