diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 3ed133fa9..c180dd9c5 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -612,6 +612,9 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 			MenuItem cancelTransmission = menu.findItem(R.id.cancel_transmission);
 			MenuItem deleteFile = menu.findItem(R.id.delete_file);
 			MenuItem showErrorMessage = menu.findItem(R.id.show_error_message);
+			if (!treatAsFile && !GeoHelper.isGeoUri(m.getBody()) && !m.treatAsDownloadable()) {
+				selectText.setVisible(ListSelectionManager.isSupported());
+			}
 			if (m.getEncryption() == Message.ENCRYPTION_DECRYPTION_FAILED) {
 				retryDecryption.setVisible(true);
 			}
diff --git a/src/main/res/menu/message_context.xml b/src/main/res/menu/message_context.xml
index 4bef476f7..bd2208846 100644
--- a/src/main/res/menu/message_context.xml
+++ b/src/main/res/menu/message_context.xml
@@ -5,18 +5,18 @@
         android:id="@+id/select_text"
         android:title="@string/select_text"
         android:visible="false"/>
+    <item
+        android:id="@+id/share_with"
+        android:title="@string/share_with"
+        android:visible="false"/>
     <item
         android:id="@+id/retry_decryption"
-        android:title="Retry decryption"
+        android:title="@string/retry_decryption"
         android:visible="false"/>
     <item
         android:id="@+id/correct_message"
         android:title="@string/correct_message"
         android:visible="false"/>
-    <item
-        android:id="@+id/share_with"
-        android:title="@string/share_with"
-        android:visible="false"/>
     <item
         android:id="@+id/copy_url"
         android:title="@string/copy_original_url"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index cea63902f..fe2f32abb 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -744,4 +744,5 @@
 	<string name="block_stranger">Block stranger</string>
 	<string name="block_entire_domain">Block entire domain</string>
 	<string name="online_right_now">online right now</string>
+	<string name="retry_decryption">Retry decryption</string>
 </resources>