diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
index 09b62558f8..95d43677ca 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
@@ -1590,7 +1590,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
         btnGC.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Helper.gc();
+                Helper.gc(true);
                 DB.shrinkMemory(v.getContext());
             }
         });
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 821341d7a5..db092d2f6b 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -3099,7 +3099,11 @@ public class Helper {
     // Miscellaneous
 
     static void gc() {
-        if (BuildConfig.DEBUG) {
+        gc(false);
+    }
+
+    static void gc(boolean force) {
+        if (force || BuildConfig.DEBUG) {
             Runtime.getRuntime().gc();
             try {
                 Thread.sleep(50);