diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 306595eb81..8332a44729 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -342,6 +342,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private ImageButton ibFull;
         private ImageButton ibImages;
         private ImageButton ibUnsubscribe;
+        private ImageButton ibJunk;
         private ImageButton ibVerify;
         private ImageButton ibDecrypt;
 
@@ -519,6 +520,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ibFull = vsBody.findViewById(R.id.ibFull);
             ibImages = vsBody.findViewById(R.id.ibImages);
             ibUnsubscribe = vsBody.findViewById(R.id.ibUnsubscribe);
+            ibJunk = vsBody.findViewById(R.id.ibJunk);
             ibVerify = vsBody.findViewById(R.id.ibVerify);
             ibDecrypt = vsBody.findViewById(R.id.ibDecrypt);
 
@@ -595,6 +597,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 ibFull.setOnClickListener(this);
                 ibImages.setOnClickListener(this);
                 ibUnsubscribe.setOnClickListener(this);
+                ibJunk.setOnClickListener(this);
                 ibVerify.setOnClickListener(this);
                 ibDecrypt.setOnClickListener(this);
 
@@ -658,6 +661,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 ibFull.setOnClickListener(null);
                 ibImages.setOnClickListener(null);
                 ibUnsubscribe.setOnClickListener(null);
+                ibJunk.setOnClickListener(null);
                 ibVerify.setOnClickListener(null);
                 ibDecrypt.setOnClickListener(null);
 
@@ -1033,6 +1037,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ibFull.setVisibility(View.GONE);
             ibImages.setVisibility(View.GONE);
             ibUnsubscribe.setVisibility(View.GONE);
+            ibJunk.setVisibility(View.GONE);
             ibVerify.setVisibility(View.GONE);
             ibDecrypt.setVisibility(View.GONE);
 
@@ -1147,6 +1152,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ibFull.setVisibility(View.VISIBLE);
             ibImages.setVisibility(View.GONE);
             ibUnsubscribe.setVisibility(message.unsubscribe == null ? View.GONE : View.VISIBLE);
+            ibJunk.setVisibility(
+                    message.uid == null || message.folderReadOnly &&
+                            (hasJunk && !EntityFolder.JUNK.equals(message.folderType))
+                            ? View.GONE : View.VISIBLE);
             ibDecrypt.setVisibility(View.GONE);
             ibVerify.setVisibility(View.GONE);
 
@@ -2097,6 +2106,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     case R.id.ibUnsubscribe:
                         onActionUnsubscribe(message);
                         break;
+                    case R.id.ibJunk:
+                        onActionJunk(message);
+                        break;
                     case R.id.ibVerify:
                     case R.id.ibDecrypt:
                         onActionDecrypt(message, false);
@@ -2766,6 +2778,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             onOpenLink(uri, context.getString(R.string.title_legend_show_unsubscribe));
         }
 
+        private void onActionJunk(TupleMessageEx message) {
+            onMenuJunk(message);
+        }
+
         private void onActionDecrypt(TupleMessageEx message, boolean auto) {
             int encrypt = (message.encrypt == null ? EntityMessage.PGP_SIGNENCRYPT /* Inline */ : message.encrypt);
 
diff --git a/app/src/main/res/layout/include_message_navigation.xml b/app/src/main/res/layout/include_message_navigation.xml
index 40d90962c9..850bafc599 100644
--- a/app/src/main/res/layout/include_message_navigation.xml
+++ b/app/src/main/res/layout/include_message_navigation.xml
@@ -74,10 +74,26 @@
         android:padding="3dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_decrypt"
-        app:layout_constraintEnd_toStartOf="@+id/ibUnsubscribe"
+        app:layout_constraintEnd_toStartOf="@+id/ibJunk"
         app:layout_constraintTop_toBottomOf="@id/vSeparatorBottom"
         app:srcCompat="@drawable/baseline_lock_open_24" />
 
+    <ImageButton
+        android:id="@+id/ibJunk"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:layout_marginTop="3dp"
+        android:layout_marginEnd="12dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/title_legend_show_unsubscribe"
+        android:foregroundTint="?android:attr/textColorSecondary"
+        android:padding="3dp"
+        android:scaleType="fitCenter"
+        android:tooltipText="@string/title_legend_show_junk"
+        app:layout_constraintEnd_toStartOf="@+id/ibUnsubscribe"
+        app:layout_constraintTop_toBottomOf="@id/vSeparatorBottom"
+        app:srcCompat="@drawable/baseline_flag_24" />
+
     <ImageButton
         android:id="@+id/ibUnsubscribe"
         android:layout_width="36dp"
diff --git a/app/src/main/res/menu/popup_message_more.xml b/app/src/main/res/menu/popup_message_more.xml
index b593fa9542..bca4a8444d 100644
--- a/app/src/main/res/menu/popup_message_more.xml
+++ b/app/src/main/res/menu/popup_message_more.xml
@@ -30,7 +30,8 @@
 
     <item
         android:id="@+id/menu_junk"
-        android:title="@string/title_spam" />
+        android:title="@string/title_spam"
+        android:visible="false" />
 
     <item
         android:id="@+id/menu_resync"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index abcd48028b..994943d92f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -930,6 +930,7 @@
     <string name="title_legend_expander">Expander</string>
     <string name="title_legend_avatar">Avatar</string>
     <string name="title_legend_show_quotes">Show quotes</string>
+    <string name="title_legend_show_junk">Treat as spam</string>
     <string name="title_legend_show_unsubscribe">Unsubscribe from list</string>
     <string name="title_legend_show_images">Show images</string>
     <string name="title_legend_show_full">Show fullscreen</string>