Index: email.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/email/email.module,v
retrieving revision 1.9.2.3
diff -u -p -r1.9.2.3 email.module
--- email.module	17 Apr 2007 05:58:31 -0000	1.9.2.3
+++ email.module	1 Apr 2008 14:26:59 -0000
@@ -350,8 +350,7 @@ function email_mail_page_form_submit($fo
   $from = $edit['mail'];
 
   // Compose the body:
-  $message[] = t("%name sent a message using the contact form at %form.", array('%name' => $edit['name'], '%form' => url($_GET['q'], NULL, NULL, TRUE)));
-  $message[] = $edit['message'];
+  $message[] = t("@name sent a message using the contact form at @form.", array('@name' => $edit['name'], '@form' => url($_GET['q'], NULL, NULL, TRUE)));  $message[] = $edit['message'];
 
   // Tidy up the body:
   foreach ($message as $key => $value) {
@@ -359,7 +358,7 @@ function email_mail_page_form_submit($fo
   }
 
   // Format the category:
-  $subject = t('[%title - %contact] %subject', array('%title' => preg_replace("/\r|\n/",'',$node->title), '%contact' => $types['fields'][$fieldname]['widget']['label'], '%subject' => $edit['subject']));
+  $subject = t('[@title - @contact] @subject', array('@title' => preg_replace("/\r|\n/",'',$node->title), '@contact' => $types['fields'][$fieldname]['widget']['label'], '@subject' => $edit['subject']));
 
   // Prepare the body:
   $body = implode("\n\n", $message);