diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 9ff86260c4b..b9281765771 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -429,7 +429,7 @@ if ($action == 'delete')
 }
 
 
-$sql = "SELECT rowid as rowid, label, type_template, lang, fk_user, private, position, topic, joinfiles, content_lines, content, enabled, active";
+$sql = "SELECT rowid as rowid, module, label, type_template, lang, fk_user, private, position, topic, joinfiles, content_lines, content, enabled, active";
 $sql .= " FROM ".MAIN_DB_PREFIX."c_email_templates";
 $sql .= " WHERE entity IN (".getEntity('email_template').")";
 if (!$user->admin)
@@ -779,6 +779,13 @@ if ($resql)
 
 				print "</tr>\n";
 			} else {
+			    if ($obj->module) {
+			        $tempmodulekey = $obj->module;
+			        if (empty($conf->$tempmodulekey) || empty($conf->$tempmodulekey->enabled)) {
+			            $i++;
+			            continue;
+			        }
+			    }
 				$keyforobj = 'type_template';
 				if (!in_array($obj->$keyforobj, array_keys($elementList)))
 				{