diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 0b50d7c4c5..5f0ee10a63 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1547,8 +1547,14 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 popupMenu.getMenu().add(Menu.NONE, R.string.title_seen, 1, R.string.title_seen);
 
             popupMenu.getMenu().add(Menu.NONE, R.string.title_snooze, 2, R.string.title_snooze);
-            popupMenu.getMenu().add(Menu.NONE, R.string.title_flag_color, 3, R.string.title_flag_color);
-            popupMenu.getMenu().add(Menu.NONE, R.string.title_move, 4, R.string.title_move);
+
+            if (message.ui_snoozed == null)
+                popupMenu.getMenu().add(Menu.NONE, R.string.title_hide, 3, R.string.title_hide);
+            else if (message.ui_snoozed == Long.MAX_VALUE)
+                popupMenu.getMenu().add(Menu.NONE, R.string.title_unhide, 3, R.string.title_unhide);
+
+            popupMenu.getMenu().add(Menu.NONE, R.string.title_flag_color, 4, R.string.title_flag_color);
+            popupMenu.getMenu().add(Menu.NONE, R.string.title_move, 5, R.string.title_move);
 
             popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
                 @Override
@@ -1563,6 +1569,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                         case R.string.title_snooze:
                             onMenuSnooze();
                             return true;
+                        case R.string.title_hide:
+                        case R.string.title_unhide:
+                            onActionHide(message);
+                            return true;
                         case R.string.title_flag_color:
                             onMenuColor();
                             return true;