diff --git a/src/yunohost/diagnosis.py b/src/yunohost/diagnosis.py
index 4fad86ffd..035e1a889 100644
--- a/src/yunohost/diagnosis.py
+++ b/src/yunohost/diagnosis.py
@@ -558,9 +558,10 @@ def _list_diagnosis_categories():
 
 def _email_diagnosis_issues():
     from yunohost.domain import _get_maindomain
-    from_ = "diagnosis@%s (Automatic diagnosis)" % _get_maindomain()
+    maindomain = _get_maindomain()
+    from_ = "diagnosis@%s (Automatic diagnosis on %s)" % (maindomain, maindomain)
     to_ = "root"
-    subject_ = "Issues found by automatic diagnosis"
+    subject_ = "Issues found by automatic diagnosis on %s" % maindomain
 
     disclaimer = "The automatic diagnosis on your YunoHost server identified some issues on your server. You will find a description of the issues below. You can manage those issues in the 'Diagnosis' section in your webadmin."