diff --git a/app/src/main/java/eu/faircode/email/DebugHelper.java b/app/src/main/java/eu/faircode/email/DebugHelper.java
index 17bd7bd7f1..1b917e29fe 100644
--- a/app/src/main/java/eu/faircode/email/DebugHelper.java
+++ b/app/src/main/java/eu/faircode/email/DebugHelper.java
@@ -467,10 +467,19 @@ public class DebugHelper {
         long storage_available = Helper.getAvailableStorageSpace();
         long storage_total = Helper.getTotalStorageSpace();
         long storage_used = Helper.getSizeUsed(context.getFilesDir());
-        sb.append(String.format("Storage space: %s/%s App: %s\r\n",
+        sb.append(String.format("Storage space: %s/%s App: %s Dir: %s\r\n",
                 Helper.humanReadableByteCount(storage_total - storage_available),
                 Helper.humanReadableByteCount(storage_total),
-                Helper.humanReadableByteCount(storage_used)));
+                Helper.humanReadableByteCount(storage_used),
+                Environment.getDataDirectory().getAbsolutePath()));
+
+        String ext = Environment.getExternalStorageDirectory().getAbsolutePath();
+        long ext_storage_available = Helper.getAvailableStorageSpace(ext);
+        long ext_storage_total = Helper.getTotalStorageSpace(ext);
+        sb.append(String.format("External storage space: %s/%s Dir: %s\r\n",
+                Helper.humanReadableByteCount(ext_storage_total - ext_storage_available),
+                Helper.humanReadableByteCount(ext_storage_total),
+                ext));
 
         long cache_used = Helper.getSizeUsed(context.getCacheDir());
         long cache_quota = Helper.getCacheQuota(context);
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 7e4c6f7705..ddb3535f14 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -3161,12 +3161,20 @@ public class Helper {
     }
 
     static long getAvailableStorageSpace() {
-        StatFs stats = new StatFs(Environment.getDataDirectory().getAbsolutePath());
-        return stats.getAvailableBlocksLong() * stats.getBlockSizeLong();
+        return getAvailableStorageSpace(Environment.getDataDirectory().getAbsolutePath());
+    }
+
+    static long getAvailableStorageSpace(String dir) {
+        StatFs stats = new StatFs(dir);
+        return stats.getAvailableBytes();
     }
 
     static long getTotalStorageSpace() {
-        StatFs stats = new StatFs(Environment.getDataDirectory().getAbsolutePath());
+        return getTotalStorageSpace(Environment.getDataDirectory().getAbsolutePath());
+    }
+
+    static long getTotalStorageSpace(String dir) {
+        StatFs stats = new StatFs(dir);
         return stats.getTotalBytes();
     }