1 files changed, 11 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/res/menu/encrypt_file_fragment.xml b/OpenKeychain/src/main/res/menu/encrypt_file_fragment.xml
index 640081eba..e719487a7 100644
--- a/OpenKeychain/src/main/res/menu/encrypt_file_fragment.xml
+++ b/OpenKeychain/src/main/res/menu/encrypt_file_fragment.xml
@@ -6,37 +6,45 @@
         android:id="@+id/encrypt_save"
         android:title="@string/btn_encrypt_save_file"
         android:icon="@drawable/ic_action_encrypt_save_24dp"
-        app:showAsAction="always" />
+        android:orderInCategory="0"
+        app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/encrypt_share"
         android:title="@string/btn_encrypt_share_file"
         android:icon="@drawable/ic_action_encrypt_share_24dp"
-        app:showAsAction="always" />
+        android:orderInCategory="0"
+        app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/encrypt_copy"
         android:title="@string/btn_copy_encrypted_signed"
-        android:icon="@drawable/ic_action_encrypt_copy_24dp" />
+        android:icon="@drawable/ic_action_encrypt_copy_24dp"
+        android:orderInCategory="0"
+        app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/check_delete_after_encrypt"
         android:title="@string/label_delete_after_encryption"
+        android:orderInCategory="1"
         android:checkable="true" />
 
     <item
         android:id="@+id/check_enable_compression"
         android:title="@string/label_enable_compression"
+        android:orderInCategory="1"
         android:checkable="true" />
 
     <item
         android:id="@+id/check_encrypt_filenames"
         android:title="@string/label_encrypt_filenames"
+        android:orderInCategory="1"
         android:checkable="true" />
 
     <item
         android:id="@+id/check_use_armor"
         android:title="@string/label_file_ascii_armor"
+        android:orderInCategory="1"
         android:checkable="true" />
 
     <!--<item-->