changed design language to match BTBV proposal

* untrusted messages have red background
* unverified messages have normal background and red lock

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main/java/de/pixart/messenger/entities/Message.java b/src/main/java/de/pixart/messenger/entities/Message.java
index 4224f6d6f..14120908f 100644
--- a/src/main/java/de/pixart/messenger/entities/Message.java
+++ b/src/main/java/de/pixart/messenger/entities/Message.java
@@ -495,7 +495,7 @@ public class Message extends AbstractEntity {
                         !message.bodyIsHeart() &&
                         !this.bodyIsXmpp() &&
                         !message.bodyIsXmpp() &&
-                        this.isTrusted() == message.isTrusted()
+                        ((this.axolotlFingerprint == null && message.axolotlFingerprint == null) || this.axolotlFingerprint.equals(message.getFingerprint()))
                 );
     }
 
@@ -819,7 +819,7 @@ public class Message extends AbstractEntity {
 
     public boolean isTrusted() {
         FingerprintStatus s = conversation.getAccount().getAxolotlService().getFingerprintTrust(axolotlFingerprint);
-        return s != null && s.isTrustedAndActive();
+        return s != null && s.isTrusted();
     }
 
     private int getPreviousEncryption() {