diff --git a/app/core/src/main/java/com/fsck/k9/K9.kt b/app/core/src/main/java/com/fsck/k9/K9.kt
index 475202d3fab8dae288a412ded868984fbfbb7958..966d02da406525f1c14c8eba8f9cf77addc576d4 100644
--- a/app/core/src/main/java/com/fsck/k9/K9.kt
+++ b/app/core/src/main/java/com/fsck/k9/K9.kt
@@ -235,7 +235,7 @@ object K9 : EarlyInit {
 
     @get:Synchronized
     @set:Synchronized
-    var isShowComposeButtonOnMessageList = true
+    var isShowComposeButtonOnMessageList = false
 
     @get:Synchronized
     @set:Synchronized
@@ -369,7 +369,7 @@ object K9 : EarlyInit {
         splitViewMode = storage.getEnum("splitViewMode", SplitViewMode.NEVER)
 
         isUseBackgroundAsUnreadIndicator = storage.getBoolean("useBackgroundAsUnreadIndicator", true)
-        isShowComposeButtonOnMessageList = storage.getBoolean("showComposeButtonOnMessageList", true)
+        isShowComposeButtonOnMessageList = storage.getBoolean("showComposeButtonOnMessageList", false)
         isThreadedViewEnabled = storage.getBoolean("threadedView", true)
         fontSizes.load(storage)