1 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/util/EditMessageActionModeCallback.java b/src/main/java/de/pixart/messenger/ui/util/EditMessageActionModeCallback.java
index d7e2ca347..cb50e4164 100644
--- a/src/main/java/de/pixart/messenger/ui/util/EditMessageActionModeCallback.java
+++ b/src/main/java/de/pixart/messenger/ui/util/EditMessageActionModeCallback.java
@@ -55,7 +55,10 @@ public class EditMessageActionModeCallback implements ActionMode.Callback {
         MenuInflater inflater = mode.getMenuInflater();
         inflater.inflate(R.menu.edit_message_actions, menu);
         MenuItem pasteAsQuote = menu.findItem(R.id.paste_as_quote);
-        pasteAsQuote.setVisible(clipboardManager.hasPrimaryClip() && clipboardManager.getPrimaryClipDescription().hasMimeType("text/plain"));
+        ClipData primaryClip = clipboardManager.getPrimaryClip();
+        if (primaryClip != null && primaryClip.getItemCount() >= 0) {
+            pasteAsQuote.setVisible(primaryClip.getDescription().getMimeType(0).startsWith("text/") && primaryClip.getItemAt(0).getText() != null);
+        }
         return true;
     }
 
@@ -67,8 +70,8 @@ public class EditMessageActionModeCallback implements ActionMode.Callback {
     @Override
     public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
         if (item.getItemId() == R.id.paste_as_quote) {
-            ClipData primaryClip = clipboardManager.getPrimaryClip();
-            if (primaryClip.getItemCount() >= 1) {
+            final ClipData primaryClip = clipboardManager.getPrimaryClip();
+            if (primaryClip != null && primaryClip.getItemCount() >= 1) {
                 editMessage.insertAsQuote(primaryClip.getItemAt(0).getText().toString());
                 return true;
             }