--- flag_friend.module.orig	2009-06-03 07:02:56.000000000 +0600
+++ flag_friend.module	2009-06-07 21:28:15.000000000 +0600
@@ -507,7 +507,7 @@ function theme_flag_friend_message_email
       // sender confirmed you as a friend
       $email['subject'] = t('!username confirmed you as a friend !site', array(
         '!username' => $sender->name,
-        '!site' => 'on '. variable_get('site_name', ''),
+        '!site' => variable_get('site_name', ''),
         ));
       $email['body'] = t('!firstname confirmed you as a friend on !site.
 
@@ -521,15 +521,14 @@ function theme_flag_friend_message_email
       The !site Team', array(
         '!firstname' => $sender->firstname ? $sender->firstname : $sender->name,
         '!site' => variable_get('site_name', ''),
-        '!message' => $flag->friend_message ? 'Message:
-        '. $flag->friend_message : '',
+        '!message' => $flag->friend_message ? t('Message:'). $flag->friend_message : '',
         '!link' => url('user/'. $sender->uid, array('absolute' => TRUE)),
         ));
       break;
 
     case FLAG_FRIEND_PENDING:
       // sender added you as a friend
-      $email['subject'] = t('!username added you as a friend !site', array('!username' => $sender->name, '!site' => 'on '. variable_get('site_name', '')));
+      $email['subject'] = t('!username added you as a friend !site', array('!username' => $sender->name, '!site' => variable_get('site_name', '')));
       $email['body'] = t('!firstname added you as a friend on !site. We need to confirm that you know !firstname in order for you to be friends on !site.
 
       To confirm this friend request, follow the link below:
@@ -541,8 +540,7 @@ function theme_flag_friend_message_email
       The !site Team', array(
         '!firstname' => $sender->firstname ? $sender->firstname : $sender->name,
         '!site' => variable_get('site_name', ''),
-        '!message' => $flag->friend_message ? 'Message:
-        '. $flag->friend_message : '',
+        '!message' => $flag->friend_message ? t('Message:'). $flag->friend_message : '',
         '!link' => url('user/'. $recipient->uid .'/friends', array('absolute' => TRUE)),
         ));
       break;