correct view of encrypted messages

fixes #99

1 files changed, 2 insertions, 4 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
index b125a9f0b..058da3c33 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
@@ -260,8 +260,6 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
             });
         } else if (!error && type == SENT) {
             viewHolder.resend_button.setVisibility(View.GONE);
-        } else if (!message.isValidInSession() && type == RECEIVED) {
-            viewHolder.time.setTextColor(activity.getUnencryptedTextColor());
         } else {
             viewHolder.time.setTextColor(this.getMessageTextColor(darkBackground, false));
         }
@@ -270,10 +268,10 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
         } else {
             boolean verified = false;
             if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL) {
-                final FingerprintStatus status = message.getConversation()
+                FingerprintStatus status = message.getConversation()
                         .getAccount().getAxolotlService().getFingerprintTrust(
                                 message.getFingerprint());
-                if (status != null && status.isVerified()) {
+                if (status != null && status.isTrustedAndActive()) {
                     verified = true;
                 }
             }