diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index c7f657f76d..6910507565 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -886,7 +886,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvFrom.setText(MessageHelper.formatAddresses(addresses, name_email, false));
             tvFrom.setPaintFlags(tvFrom.getPaintFlags() & ~Paint.UNDERLINE_TEXT_FLAG);
             tvSize.setText(message.totalSize == null ? null : Helper.humanReadableByteCount(message.totalSize, true));
-            tvSize.setVisibility(message.totalSize != null && "size".equals(sort) ? View.VISIBLE : View.GONE);
+            tvSize.setVisibility(
+                    message.totalSize != null && ("size".equals(sort) || "attachments".equals(sort))
+                            ? View.VISIBLE : View.GONE);
             tvTime.setText(date && "time".equals(sort)
                     ? TF.format(message.received)
                     : Helper.getRelativeTimeSpanString(context, message.received));
diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 2763611197..141b496b1d 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -82,6 +82,7 @@ public interface DaoMessage {
             "  WHEN 'sender' = :sort THEN LOWER(message.sender)" +
             "  WHEN 'subject' = :sort THEN LOWER(message.subject)" +
             "  WHEN 'size' = :sort THEN -SUM(message.total)" +
+            "  WHEN 'attachments' = :sort THEN -SUM(message.attachments)" +
             "  WHEN 'snoozed' = :sort THEN SUM(CASE WHEN message.ui_snoozed IS NULL THEN 0 ELSE 1 END) = 0" +
             "  ELSE 0" +
             " END, CASE WHEN :ascending THEN message.received ELSE -message.received END")
@@ -129,6 +130,7 @@ public interface DaoMessage {
             "  WHEN 'sender' = :sort THEN LOWER(message.sender)" +
             "  WHEN 'subject' = :sort THEN LOWER(message.subject)" +
             "  WHEN 'size' = :sort THEN -SUM(message.total)" +
+            "  WHEN 'attachments' = :sort THEN -SUM(message.attachments)" +
             "  WHEN 'snoozed' = :sort THEN SUM(CASE WHEN message.ui_snoozed IS NULL THEN 0 ELSE 1 END) = 0" +
             "  ELSE 0" +
             " END, CASE WHEN :ascending THEN message.received ELSE -message.received END")
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index cbbc72fe97..0689a8d2e2 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -3029,6 +3029,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             menu.findItem(R.id.menu_sort_on_sender).setVisible(false);
             menu.findItem(R.id.menu_sort_on_subject).setVisible(false);
             menu.findItem(R.id.menu_sort_on_size).setVisible(false);
+            menu.findItem(R.id.menu_sort_on_attachments).setVisible(false);
             menu.findItem(R.id.menu_sort_on_snoozed).setVisible(false);
         }
 
@@ -3044,6 +3045,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             menu.findItem(R.id.menu_sort_on_subject).setChecked(true);
         else if ("size".equals(sort))
             menu.findItem(R.id.menu_sort_on_size).setChecked(true);
+        else if ("attachments".equals(sort))
+            menu.findItem(R.id.menu_sort_on_attachments).setChecked(true);
         else if ("snoozed".equals(sort))
             menu.findItem(R.id.menu_sort_on_snoozed).setChecked(true);
         menu.findItem(R.id.menu_ascending).setChecked(ascending);
@@ -3121,6 +3124,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 onMenuSort("size");
                 return true;
 
+            case R.id.menu_sort_on_attachments:
+                item.setChecked(true);
+                onMenuSort("attachments");
+                return true;
+
             case R.id.menu_sort_on_snoozed:
                 item.setChecked(true);
                 onMenuSort("snoozed");
diff --git a/app/src/main/res/menu/menu_messages.xml b/app/src/main/res/menu/menu_messages.xml
index fb8c402633..9f737fffef 100644
--- a/app/src/main/res/menu/menu_messages.xml
+++ b/app/src/main/res/menu/menu_messages.xml
@@ -40,6 +40,9 @@
                 <item
                     android:id="@+id/menu_sort_on_size"
                     android:title="@string/title_sort_on_size" />
+                <item
+                    android:id="@+id/menu_sort_on_attachments"
+                    android:title="@string/title_sort_on_attachments" />
                 <item
                     android:id="@+id/menu_sort_on_snoozed"
                     android:title="@string/title_sort_on_hidden" />