--- mass_contact/mass_contact.module	2010-10-09 01:51:40.000000000 +0200
+++ mass_contact_by_sapox/mass_contact.module	2011-06-17 17:50:50.373612002 +0200
@@ -1254,6 +1254,7 @@
  *   A keyed array containing the current state of the form.
  */
 function mass_contact_mail_page_submit($form, &$form_state) {
+  global $language;
   $character_set       = (variable_get('mass_contact_character_set', '')) ? variable_get('mass_contact_character_set', '') : 'UTF-8';
   $bcc                 = $form_state['values']['bcc'];
   $nodecc              = $form_state['values']['nodecc'];
@@ -1545,7 +1546,7 @@
     $optout_setting = variable_get('mass_contact_optout_d', 0);
     if ($optout_setting == 1 || $optout_setting == 2) {
       if ($form_state['values']['optout'] == 1) {
-        $ooresult = db_query("SELECT uid FROM {users} WHERE status <> %d", 0);
+        $ooresult = db_query("SELECT uid FROM {users} WHERE status <> %d AND language = '%s'", 0, $language->language);
         while ($oouid = db_fetch_object($ooresult)) {
           $account = user_load(array('uid' => $oouid->uid, 'status' => 1));
           if ($optout_setting == 1 && $account->mass_contact_optout == 1) {
@@ -1571,7 +1572,7 @@
     $roles = explode(',', $contact->recipients);
     foreach ($roles as $r) {
       if ($r == 2) { // all users
-        $recipients = db_query("SELECT name, mail, uid FROM {users} WHERE status <> %d AND uid > %d", 0, 0);
+        $recipients = db_query("SELECT name, mail, uid FROM {users} WHERE (status <> %d AND uid > %d) AND language = '%s'", 0, 0, $language->language);
         while ($obj = db_fetch_object($recipients)) {
           $rname = $obj->name;
           $rmail = $obj->mail;
@@ -1585,7 +1586,7 @@
       }
       else {
         // Get from users_roles, then role -> user.
-        $uids = db_query("SELECT ur.uid FROM {users_roles} ur LEFT JOIN {users} u ON ur.uid = u.uid WHERE ur.rid = %d AND u.status <> %d", $r, 0);
+        $uids = db_query("SELECT ur.uid FROM {users_roles} ur LEFT JOIN {users} u ON ur.uid = u.uid WHERE (ur.rid = %d AND u.status <> %d) AND u.language = '%s'", $r, 0, $language->language);
         while ($obj = db_fetch_object($uids))  {
           $ruid = $obj->uid;
           $userobj = db_fetch_object(db_query("SELECT name, mail FROM {users} WHERE uid = %d", $ruid));