2 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java
index c9bbbfca2..81c52aa1c 100644
--- a/src/main/java/de/pixart/messenger/entities/Conversation.java
+++ b/src/main/java/de/pixart/messenger/entities/Conversation.java
@@ -762,7 +762,9 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
     public int getNextEncryption() {
         final int defaultEncryption;
         AxolotlService axolotlService = account.getAxolotlService();
-        if (axolotlService != null && axolotlService.isConversationAxolotlCapable(this)) {
+        if (contactJid.asBareJid().equals(Config.BUG_REPORTS)) {
+            defaultEncryption = Message.ENCRYPTION_NONE;
+        } else if (axolotlService != null && axolotlService.isConversationAxolotlCapable(this)) {
             defaultEncryption = Message.ENCRYPTION_AXOLOTL;
         } else {
             defaultEncryption = Message.ENCRYPTION_NONE;
diff --git a/src/main/java/de/pixart/messenger/entities/Message.java b/src/main/java/de/pixart/messenger/entities/Message.java
index 501a394ad..7bf94e599 100644
--- a/src/main/java/de/pixart/messenger/entities/Message.java
+++ b/src/main/java/de/pixart/messenger/entities/Message.java
@@ -572,7 +572,7 @@ public class Message extends AbstractEntity {
                         ((this.axolotlFingerprint == null && message.axolotlFingerprint == null) || this.axolotlFingerprint.equals(message.getFingerprint())) &&
                         UIHelper.sameDay(message.getTimeSent(), this.getTimeSent()) &&
                         this.getReadByMarkers().equals(message.getReadByMarkers()) &&
-                        !this.conversation.getJid().asBareJid().toString().equals(Config.BUG_REPORTS)
+                        !this.conversation.getJid().asBareJid().equals(Config.BUG_REPORTS)
                 );
     }