1 files changed, 4 insertions, 2 deletions
diff --git a/include/functions_mail.inc.php b/include/functions_mail.inc.php
index 92d5ead6a..5f10d2f0a 100644
--- a/include/functions_mail.inc.php
+++ b/include/functions_mail.inc.php
@@ -369,7 +369,8 @@ WHERE
     $list = array();
     while ($row = mysql_fetch_array($result))
     {
-      list($row['template'], $row['theme']) = explode('/', $row['template']);
+      $row['template_theme'] = $row['template'];
+      list($row['template'], $row['theme']) = explode('/', $row['template_theme']);
       $list[] = $row;
     }
   }
@@ -387,7 +388,8 @@ FROM
 WHERE 
         '.$conf['user_fields']['email'].' IS NOT NULL
     AND group_id = '.$group_id.'
-    AND language = \''.$elem['language'].'\'
+    AND language = \''.$elem['language'].'\'
+    AND template = \''.$elem['template_theme'].'\'
 ;';
 
     $result = pwg_query($query);