diff --git a/omemo/modules/omemo.py b/omemo/modules/omemo.py
index 45651c8..b0a01aa 100644
--- a/omemo/modules/omemo.py
+++ b/omemo/modules/omemo.py
@@ -242,9 +242,17 @@ class OMEMO(BaseModule):
             trust = Trust.VERIFIED
             del self._muc_temp_store[properties.omemo.payload]
 
-        except (DecryptionFailed, MessageNotForDevice):
+        except DecryptionFailed:
             return
 
+        except MessageNotForDevice:
+            plaintext = _('This message was encrypted with OMEMO, '
+                          'but not for your device.')
+            # Neither trust nor fingerprint can be verified if we didn't
+            # successfully decrypt the message
+            trust = Trust.UNTRUSTED
+            fingerprint = None
+
         prepare_stanza(stanza, plaintext)
         self._debug_print_stanza(stanza)
         properties.encrypted = EncryptionData({'name': ENCRYPTION_NAME,