diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index ce4cc008e..a8fecc6f7 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -2753,8 +2753,10 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
         if (lastEditableMessage != null) {
             correctMessage(lastEditableMessage);
             return true;
+        } else {
+            Toast.makeText(getActivity(),R.string.could_not_correct_message, Toast.LENGTH_LONG).show();
+            return false;
         }
-        return false;
     }
 
     @Override
@@ -2763,7 +2765,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
         if (service == null) {
             return;
         }
-        Account.State status = conversation.getAccount().getStatus();
+        final Account.State status = conversation.getAccount().getStatus();
         if (status == Account.State.ONLINE && conversation.setOutgoingChatState(ChatState.COMPOSING)) {
             service.sendChatState(conversation);
         }
@@ -2776,7 +2778,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
         if (service == null) {
             return;
         }
-        Account.State status = conversation.getAccount().getStatus();
+        final Account.State status = conversation.getAccount().getStatus();
         if (status == Account.State.ONLINE && conversation.setOutgoingChatState(ChatState.PAUSED)) {
             service.sendChatState(conversation);
         }
@@ -2788,7 +2790,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
         if (service == null) {
             return;
         }
-        Account.State status = conversation.getAccount().getStatus();
+        final Account.State status = conversation.getAccount().getStatus();
         if (status == Account.State.ONLINE && conversation.setOutgoingChatState(Config.DEFAULT_CHAT_STATE)) {
             service.sendChatState(conversation);
         }
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 983523a07..c6a77aaa9 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -926,6 +926,7 @@
     <string name="add_to_favorites">Add to favorites</string>
     <string name="remove_from_favorites">Remove from favorites</string>
     <string name="gpx_track">GPX track</string>
+    <string name="could_not_correct_message">Could not correct message</string>
     <plurals name="view_users">
         <item quantity="one">View %1$d Participant</item>
         <item quantity="other">View %1$d Participants</item>