1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 6ee9552e8..7deb54173 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -365,6 +365,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
                             }
                             updateChatMsgHint();
                             updateSendButton();
+                            updateEditablity();
                         }
                         break;
                     default:
@@ -857,6 +858,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
         this.conversation.setNextCounterpart(counterpart);
         updateChatMsgHint();
         updateSendButton();
+        updateEditablity();
     }
 
     private void correctMessage(Message message) {
@@ -1260,7 +1262,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
     }
 
     private void updateEditablity() {
-        boolean canWrite = this.conversation.getMode() == Conversation.MODE_SINGLE || this.conversation.getMucOptions().participating();
+        boolean canWrite = this.conversation.getMode() == Conversation.MODE_SINGLE || this.conversation.getMucOptions().participating() || this.conversation.getNextCounterpart() != null;
         this.mEditMessage.setFocusable(canWrite);
         this.mEditMessage.setFocusableInTouchMode(canWrite);
         this.mSendButton.setEnabled(canWrite);