diff --git a/bt5/erp5_promise/SkinTemplateItem/portal_skins/erp5_promise/Alarm_checkPromiseMailServer.xml b/bt5/erp5_promise/SkinTemplateItem/portal_skins/erp5_promise/Alarm_checkPromiseMailServer.xml
index 6e0ce58b38eb49d47fc7639fbb82c5dc3ee0ac21..8a128b927b1170bdb24081e17dc785894f40c73d 100644
--- a/bt5/erp5_promise/SkinTemplateItem/portal_skins/erp5_promise/Alarm_checkPromiseMailServer.xml
+++ b/bt5/erp5_promise/SkinTemplateItem/portal_skins/erp5_promise/Alarm_checkPromiseMailServer.xml
@@ -55,6 +55,14 @@
 portal = context.getPortalObject()\n
 mailhost = portal.MailHost\n
 promise_url = portal.getPromiseParameter(\'external_service\', \'smtp_url\').rstrip(\'/\')\n
+if getattr(mailhost, \'getMessageList\', None) is not None:\n
+  context.newActiveProcess().postResult(ActiveResult(\n
+    severity=1,\n
+    summary="%s/MailHost is not real MailHost" % portal.getPath(),\n
+    detail="Possibly comes from DummyMailHost. The object has to be fixed by recreating it."\n
+  ))\n
+  return\n
+\n
 \n
 if promise_url is None:\n
   return\n
diff --git a/bt5/erp5_promise/SkinTemplateItem/portal_skins/erp5_promise/Alarm_installMailServer.xml b/bt5/erp5_promise/SkinTemplateItem/portal_skins/erp5_promise/Alarm_installMailServer.xml
index e024736d347fd8472603973d0c3c220431280f3b..625f2162109bb4a7210772ef270951e6d7ad9eef 100644
--- a/bt5/erp5_promise/SkinTemplateItem/portal_skins/erp5_promise/Alarm_installMailServer.xml
+++ b/bt5/erp5_promise/SkinTemplateItem/portal_skins/erp5_promise/Alarm_installMailServer.xml
@@ -52,6 +52,9 @@
             <key> <string>_body</string> </key>
             <value> <string>portal = context.getPortalObject()\n
 mailhost = portal.MailHost\n
+if getattr(mailhost, \'getMessageList\', None) is not None:\n
+  # cannot fix wrong MailHost\n
+  return\n
 promise_url = portal.getPromiseParameter(\'external_service\', \'smtp_url\')\n
 \n
 protocol, promise_url = promise_url.split(\'://\', 1)\n
diff --git a/bt5/erp5_promise/bt/revision b/bt5/erp5_promise/bt/revision
index cabf43b5ddf813cbe89697372a21373f14921884..410b14d2ce6f958c13adcb30807e8673074c49d9 100644
--- a/bt5/erp5_promise/bt/revision
+++ b/bt5/erp5_promise/bt/revision
@@ -1 +1 @@
-24
\ No newline at end of file
+25
\ No newline at end of file