diff --git a/src/components/mail/compose.rs b/src/components/mail/compose.rs
index 2d14cdd90..06b42ac27 100644
--- a/src/components/mail/compose.rs
+++ b/src/components/mail/compose.rs
@@ -188,6 +188,10 @@ impl Composer {
                 format!("meli {}", option_env!("CARGO_PKG_VERSION").unwrap_or("0.0")),
             );
         }
+        if *account_settings!(context[account_hash].composing.format_flowed) {
+            ret.pager
+                .set_reflow(melib::text_processing::Reflow::FormatFlowed);
+        }
         ret
     }