diff --git a/data/hooks/diagnosis/24-mail.py b/data/hooks/diagnosis/24-mail.py
index 1336e8c2b..4c36d7ca0 100644
--- a/data/hooks/diagnosis/24-mail.py
+++ b/data/hooks/diagnosis/24-mail.py
@@ -24,7 +24,7 @@ DEFAULT_DNS_BLACKLIST = "/usr/share/yunohost/other/dnsbl_list.yml"
 class MailDiagnoser(Diagnoser):
 
     id_ = os.path.splitext(os.path.basename(__file__))[0].split("-")[1]
-    cache_duration = 600
+    cache_duration = 0
     dependencies = ["ip"]
 
     def run(self):
@@ -42,10 +42,11 @@ class MailDiagnoser(Diagnoser):
                        if type(value) == FunctionType and name.startswith("check_")]
         for check in checks:
             self.logger_debug("Running " + check)
-            for report in getattr(self, check):
+            reports = list(getattr(self, check)())
+            for report in reports:
                 yield report
-            else:
-                name = checks[6:]
+            if not reports:
+                name = check[6:]
                 yield dict(meta={"test": "mail_" + name},
                         status="SUCCESS",
                         summary="diagnosis_mail_" + name + "_ok")
@@ -58,8 +59,7 @@ class MailDiagnoser(Diagnoser):
         """
 
         for ipversion in self.ipversions:
-            cmd = '/bin/nc -{ipversion} -z -w2 yunohost.org 25'.format({
-                  'ipversion': ipversion})
+            cmd = '/bin/nc -{ipversion} -z -w2 yunohost.org 25'.format(ipversion=ipversion)
             if os.system(cmd) != 0:
                 yield dict(meta={"test": "outgoing_port_25", "ipversion": ipversion},
                            data={},
@@ -80,7 +80,7 @@ class MailDiagnoser(Diagnoser):
                                                ipversion=ipversion)
             except Exception as e:
                 yield dict(meta={"test": "mail_ehlo", "ipversion": ipversion},
-                           data={"error": e},
+                           data={"error": str(e)},
                            status="WARNING",
                            summary="diagnosis_mail_ehlo_could_not_diagnose")
                 continue
@@ -111,14 +111,14 @@ class MailDiagnoser(Diagnoser):
                 yield dict(meta={"test": "mail_fcrdns", "ip": ip},
                            data={"ehlo_domain": self.ehlo_domain},
                            status="ERROR",
-                           summary="diagnosis_mail_reverse_dns_missing")
+                           summary="diagnosis_mail_fcrdns_dns_missing")
                 continue
             if rdns_domain != self.ehlo_domain:
                 yield dict(meta={"test": "mail_fcrdns", "ip": ip},
                            data={"ehlo_domain": self.ehlo_domain,
                                  "rdns_domain": rdns_domain},
                            status="ERROR",
-                           summary="diagnosis_mail_rdns_different_from_ehlo_domain")
+                           summary="diagnosis_mail_fcrdns_different_from_ehlo_domain")
 
 
     def check_blacklist(self):
@@ -177,9 +177,9 @@ class MailDiagnoser(Diagnoser):
             pending_emails = int(output)
         except (ValueError, CalledProcessError) as e:
             yield dict(meta={"test": "mail_queue"},
-                       data={"error": e},
+                       data={"error": str(e)},
                        status="ERROR",
-                       summary="diagnosis_mail_cannot_get_queue")
+                       summary="diagnosis_mail_queue_unavailable")
         else:
             if pending_emails > 100:
                 yield dict(meta={"test": "mail_queue"},
diff --git a/locales/en.json b/locales/en.json
index 1a17c484f..327dba2a9 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -184,15 +184,15 @@
     "diagnosis_swap_none": "The system has no swap at all. You should consider adding at least 256 MB of swap to avoid situations where the system runs out of memory.",
     "diagnosis_swap_notsomuch": "The system has only {total} swap. You should consider having at least 256 MB to avoid situations where the system runs out of memory.",
     "diagnosis_swap_ok": "The system has {total} of swap!",
-    "diagnosis_mail_ougoing_port_25_ok": "Outgoing port 25 is not blocked and email can be sent to other servers.",
-    "diagnosis_mail_ougoing_port_25_blocked": "Outgoing port 25 appears to be blocked in IPv{ipversion}. You should try to unblock it in your internet service provider (or hosting provider) configuration panel. Meanwhile, the server won't be able to send emails to other servers.",
+    "diagnosis_mail_outgoing_port_25_ok": "Outgoing port 25 is not blocked and email can be sent to other servers.",
+    "diagnosis_mail_outgoing_port_25_blocked": "Outgoing port 25 appears to be blocked in IPv{ipversion}. You should try to unblock it in your internet service provider (or hosting provider) configuration panel. Meanwhile, the server won't be able to send emails to other servers.",
     "diagnosis_mail_ehlo_ok": "Postfix mail service answer correctly from outside",
     "diagnosis_mail_ehlo_unavailable": "Postfix mail service don't answer to EHLO request on IPv{ipversion}.",
     "diagnosis_mail_ehlo_wrong": "A mail server answer {wrong_ehlo} instead {right_ehlo} on IPv{ipversion}.",
     "diagnosis_mail_ehlo_could_not_diagnose": "Could not diagnose if postfix mail server is reachable from outside. Error: {error}",
-    "diagnosis_mail_reverse_dns_missing": "No reverse DNS defined for the ip {ip}.",
-    "diagnosis_mail_rdns_different_from_ehlo_domain": "Your reverse DNS {rdns_domain} is different from your EHLO domain {ehlo_domain} on {ip}.",
-    "diagnosis_mail_rdns_equal_to_ehlo_domain": "Your reverse DNS is equal to your EHLO domain {ehlo_domain} on {ip}.",
+    "diagnosis_mail_fcrdns_dns_missing": "No reverse DNS defined for the ip {ip}.",
+    "diagnosis_mail_fcrdns_different_from_ehlo_domain": "Your reverse DNS {rdns_domain} is different from your EHLO domain {ehlo_domain} on {ip}.",
+    "diagnosis_mail_fcrdns_ok": "Your reverse DNS is well configured.",
     "diagnosis_mail_blacklist_ok": "The public IPs of this instance are not listed on email blacklists.",
     "diagnosis_mail_blacklist_listed_by": "{item} is blacklisted on {blacklist_name}. Reason: {reason}. See {blacklist_website}",
     "diagnosis_mail_queue_unavailable": "Can not consult number of pending emails in queue",