diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 71c1cf7a72..4a71228adf 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -183,6 +183,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
         private RecyclerView rvAttachment;
         private Button btnDownloadAttachments;
+        private Button btnSaveAttachments;
         private TextView tvNoInternetAttachments;
 
         private BottomNavigationView bnvActions;
@@ -251,6 +252,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             rvAttachment.setAdapter(adapter);
 
             btnDownloadAttachments = itemView.findViewById(R.id.btnDownloadAttachments);
+            btnSaveAttachments = itemView.findViewById(R.id.btnSaveAttachments);
             tvNoInternetAttachments = itemView.findViewById(R.id.tvNoInternetAttachments);
 
             bnvActions = itemView.findViewById(R.id.bnvActions);
@@ -274,6 +276,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ivExpanderAddress.setOnClickListener(this);
             ivAddContact.setOnClickListener(this);
             btnDownloadAttachments.setOnClickListener(this);
+            btnSaveAttachments.setOnClickListener(this);
             btnHtml.setOnClickListener(this);
             ibQuotes.setOnClickListener(this);
             ibImages.setOnClickListener(this);
@@ -287,6 +290,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ivExpanderAddress.setOnClickListener(null);
             ivAddContact.setOnClickListener(null);
             btnDownloadAttachments.setOnClickListener(null);
+            btnSaveAttachments.setOnClickListener(null);
             btnHtml.setOnClickListener(null);
             ibQuotes.setOnClickListener(null);
             ibImages.setOnClickListener(null);
@@ -319,6 +323,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvNoInternetHeaders.setVisibility(View.GONE);
 
             btnDownloadAttachments.setVisibility(View.GONE);
+            btnSaveAttachments.setVisibility(View.GONE);
             tvNoInternetAttachments.setVisibility(View.GONE);
 
             bnvActions.setVisibility(View.GONE);
@@ -442,6 +447,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ivAnswered.setVisibility(message.ui_answered ? View.VISIBLE : View.GONE);
             ivAttachments.setVisibility(message.attachments > 0 ? View.VISIBLE : View.GONE);
             btnDownloadAttachments.setVisibility(View.GONE);
+            btnSaveAttachments.setVisibility(View.GONE);
             tvNoInternetAttachments.setVisibility(View.GONE);
             tvSubject.setText(message.subject);
 
@@ -590,18 +596,20 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                         adapter.set(attachments);
 
+                        boolean download = false;
+                        boolean save = (attachments.size() > 1);
                         boolean downloading = false;
-                        boolean all = (attachments.size() > 1);
                         for (EntityAttachment attachment : attachments) {
-                            if (attachment.progress != null) {
-                                downloading = true;
-                                break;
-                            }
+                            if (attachment.progress == null && !attachment.available)
+                                download = true;
                             if (!attachment.available)
-                                all = false;
+                                save = false;
+                            if (attachment.progress != null)
+                                downloading = true;
                         }
 
-                        btnDownloadAttachments.setVisibility(all ? View.VISIBLE : View.GONE);
+                        btnDownloadAttachments.setVisibility(download ? View.VISIBLE : View.GONE);
+                        btnSaveAttachments.setVisibility(save ? View.VISIBLE : View.GONE);
                         tvNoInternetAttachments.setVisibility(downloading && !internet ? View.VISIBLE : View.GONE);
 
                         if (message.content) {
@@ -708,6 +716,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     onToggleAddresses(pos, message);
                 else if (view.getId() == R.id.btnDownloadAttachments)
                     onDownloadAttachments(message);
+                else if (view.getId() == R.id.btnSaveAttachments)
+                    onSaveAttachments(message);
                 else if (view.getId() == R.id.btnHtml)
                     onShowHtml(message);
                 else if (view.getId() == R.id.ibQuotes)
@@ -807,7 +817,43 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             notifyItemChanged(pos);
         }
 
-        private void onDownloadAttachments(TupleMessageEx message) {
+        private void onDownloadAttachments(final TupleMessageEx message) {
+            Bundle args = new Bundle();
+            args.putLong("id", message.id);
+
+            new SimpleTask<Void>() {
+                @Override
+                protected Void onExecute(Context context, Bundle args) throws Throwable {
+                    long id = args.getLong("id");
+
+                    DB db = DB.getInstance(context);
+                    try {
+                        db.beginTransaction();
+
+                        EntityMessage msg = db.message().getMessage(id);
+                        if (message != null)
+                            for (EntityAttachment attachment : db.attachment().getAttachments(message.id))
+                                if (attachment.progress == null && !attachment.available) {
+                                    db.attachment().setProgress(attachment.id, 0);
+                                    EntityOperation.queue(context, db, msg, EntityOperation.ATTACHMENT, attachment.sequence);
+                                }
+
+                        db.setTransactionSuccessful();
+                    } finally {
+                        db.endTransaction();
+                    }
+
+                    return null;
+                }
+
+                @Override
+                protected void onException(Bundle args, Throwable ex) {
+                    Helper.unexpectedError(context, owner, ex);
+                }
+            }.execute(context, owner, args);
+        }
+
+        private void onSaveAttachments(TupleMessageEx message) {
             LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
             lbm.sendBroadcast(
                     new Intent(ActivityView.ACTION_STORE_ATTACHMENTS)
diff --git a/app/src/main/res/layout/item_message_compact.xml b/app/src/main/res/layout/item_message_compact.xml
index e139e24d9e..7b630dc085 100644
--- a/app/src/main/res/layout/item_message_compact.xml
+++ b/app/src/main/res/layout/item_message_compact.xml
@@ -561,10 +561,28 @@
             android:layout_height="wrap_content"
             android:minWidth="0dp"
             android:minHeight="0dp"
+            android:text="@string/title_download_all"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/rvAttachment" />
+
+        <Button
+            android:id="@+id/btnSaveAttachments"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
             android:text="@string/title_save_all"
             app:layout_constraintEnd_toEndOf="@id/rvAttachment"
             app:layout_constraintTop_toBottomOf="@id/rvAttachment" />
 
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/barrier_internet"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:barrierDirection="bottom"
+            app:constraint_referenced_ids="btnDownloadAttachments,btnSaveAttachments" />
+
         <TextView
             android:id="@+id/tvNoInternetAttachments"
             android:layout_width="wrap_content"
@@ -575,7 +593,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintEnd_toEndOf="@id/rvAttachment"
             app:layout_constraintStart_toStartOf="@id/rvAttachment"
-            app:layout_constraintTop_toBottomOf="@id/btnDownloadAttachments" />
+            app:layout_constraintTop_toBottomOf="@id/barrier_internet" />
 
         <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/bnvActions"
diff --git a/app/src/main/res/layout/item_message_normal.xml b/app/src/main/res/layout/item_message_normal.xml
index 848d91a060..2a19a9291b 100644
--- a/app/src/main/res/layout/item_message_normal.xml
+++ b/app/src/main/res/layout/item_message_normal.xml
@@ -553,10 +553,28 @@
             android:layout_height="wrap_content"
             android:minWidth="0dp"
             android:minHeight="0dp"
+            android:text="@string/title_download_all"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/rvAttachment" />
+
+        <Button
+            android:id="@+id/btnSaveAttachments"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
             android:text="@string/title_save_all"
             app:layout_constraintEnd_toEndOf="@id/rvAttachment"
             app:layout_constraintTop_toBottomOf="@id/rvAttachment" />
 
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/barrier_internet"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:barrierDirection="bottom"
+            app:constraint_referenced_ids="btnDownloadAttachments,btnSaveAttachments" />
+
         <TextView
             android:id="@+id/tvNoInternetAttachments"
             android:layout_width="wrap_content"
@@ -565,7 +583,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintEnd_toEndOf="@id/rvAttachment"
             app:layout_constraintStart_toStartOf="@id/rvAttachment"
-            app:layout_constraintTop_toBottomOf="@id/btnDownloadAttachments" />
+            app:layout_constraintTop_toBottomOf="@id/barrier_internet" />
 
         <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/bnvActions"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 133db1018a..d668dfd0d7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -264,6 +264,7 @@
     <string name="title_show_headers">Show headers</string>
     <string name="title_manage_keywords">Manage keywords</string>
     <string name="title_add_keyword">Add keyword</string>
+    <string name="title_download_all">Download all</string>
     <string name="title_save_all">Save all</string>
     <string name="title_show_html">Show original</string>