1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index c9fc7aeb2..e7526e315 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -400,7 +400,8 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 
     private void sendMessage() {
         final String body = mEditMessage.getText().toString();
-        if (body.length() == 0 || this.conversation == null) {
+        final Conversation conversation = this.conversation;
+        if (body.length() == 0 || conversation == null) {
             return;
         }
         final Message message;
@@ -418,7 +419,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
             message.setEdited(message.getUuid());
             message.setUuid(UUID.randomUUID().toString());
         }
-        switch (conversation.getNextEncryption()) {
+        switch (message.getConversation().getNextEncryption()) {
             case Message.ENCRYPTION_OTR:
                 sendOtrMessage(message);
                 break;