diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
index c5a20d81a7..50b6a03b2b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
@@ -585,7 +585,10 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
 
         ActivityManager am = (ActivityManager) getContext().getSystemService(Context.ACTIVITY_SERVICE);
         int class_mb = am.getMemoryClass();
-        tvMemoryClass.setText(getString(R.string.title_advanced_memory_class, class_mb + " MB"));
+        ActivityManager.MemoryInfo mi = new ActivityManager.MemoryInfo();
+        am.getMemoryInfo(mi);
+        tvMemoryClass.setText(getString(R.string.title_advanced_memory_class,
+                class_mb + " MB", Helper.humanReadableByteCount(mi.totalMem)));
 
         tvStorageSpace.setText(getString(R.string.title_advanced_storage_space,
                 Helper.humanReadableByteCount(Helper.getAvailableStorageSpace()),
diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java
index ac2570641f..1e770defef 100644
--- a/app/src/main/java/eu/faircode/email/Log.java
+++ b/app/src/main/java/eu/faircode/email/Log.java
@@ -1114,7 +1114,10 @@ public class Log {
         sb.append(String.format("Processors: %d\r\n", Runtime.getRuntime().availableProcessors()));
 
         ActivityManager am = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-        sb.append(String.format("Memory class: %d\r\n", am.getMemoryClass()));
+        ActivityManager.MemoryInfo mi = new ActivityManager.MemoryInfo();
+        am.getMemoryInfo(mi);
+        sb.append(String.format("Memory class: %d MB/%s\r\n",
+                am.getMemoryClass(), Helper.humanReadableByteCount(mi.totalMem)));
 
         sb.append(String.format("Storage space: %s/%s\r\n",
                 Helper.humanReadableByteCount(Helper.getAvailableStorageSpace()),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cd017aec37..c1d113dfb0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -493,7 +493,7 @@
     <string name="title_advanced_app">App settings</string>
     <string name="title_advanced_more">More options</string>
     <string name="title_advanced_processors" translatable="false">Processors: %1$d</string>
-    <string name="title_advanced_memory_class" translatable="false">Memory class: %1$s</string>
+    <string name="title_advanced_memory_class" translatable="false">Memory class: %1$s/%2$s</string>
     <string name="title_advanced_storage_space" translatable="false">Storage space: %1$s/%2$s</string>
     <string name="title_advanced_charsets" translatable="false">Charsets</string>
     <string name="title_advanced_ciphers" translatable="false">Ciphers</string>