Refactoring

app/src/main/java/eu/faircode/email/AdapterMessage.java

@@ -4237,18 +4237,18 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     } else if (itemId == R.id.menu_manage_keywords) {
                         onMenuManageKeywords(message);
                         return true;
-                    } else if (itemId == R.id.menu_share) {
-                        onMenuShare(message, false);
-                        return true;
-                    } else if (itemId == R.id.menu_pin) {
-                        onMenuPin(message);
-                        return true;
                     } else if (itemId == R.id.menu_event) {
                         if (ActivityBilling.isPro(context))
                             onMenuShare(message, true);
                         else
                             context.startActivity(new Intent(context, ActivityBilling.class));
                         return true;
+                    } else if (itemId == R.id.menu_share) {
+                        onMenuShare(message, false);
+                        return true;
+                    } else if (itemId == R.id.menu_pin) {
+                        onMenuPin(message);
+                        return true;
                     } else if (itemId == R.id.menu_print) {
                         onMenuPrint(message);
                         return true;

app/src/main/res/menu/popup_message_more.xml

@@ -68,6 +68,10 @@
         android:id="@+id/menu_manage_keywords"
         android:title="@string/title_manage_keywords" />
 
+    <item
+        android:id="@+id/menu_event"
+        android:title="@string/title_event" />
+
     <item
         android:id="@+id/menu_share"
         android:title="@string/title_share" />
@@ -76,10 +80,6 @@
         android:id="@+id/menu_pin"
         android:title="@string/title_pin" />
 
-    <item
-        android:id="@+id/menu_event"
-        android:title="@string/title_event" />
-
     <item
         android:id="@+id/menu_print"
         android:title="@string/title_print" />