diff --git a/src/email/message/command/save.rs b/src/email/message/command/save.rs
index d7e62f4b..bc1b9c2a 100644
--- a/src/email/message/command/save.rs
+++ b/src/email/message/command/save.rs
@@ -88,7 +88,7 @@ impl MessageSaveCommand {
             io::stdin()
                 .lock()
                 .lines()
-                .filter_map(Result::ok)
+                .map_while(Result::ok)
                 .collect::<Vec<String>>()
                 .join("\r\n")
         };
diff --git a/src/email/message/command/send.rs b/src/email/message/command/send.rs
index cc212e90..d8c265bb 100644
--- a/src/email/message/command/send.rs
+++ b/src/email/message/command/send.rs
@@ -110,7 +110,7 @@ impl MessageSendCommand {
             io::stdin()
                 .lock()
                 .lines()
-                .filter_map(Result::ok)
+                .map_while(Result::ok)
                 .collect::<Vec<_>>()
                 .join("\r\n")
         };
diff --git a/src/email/message/template/command/save.rs b/src/email/message/template/command/save.rs
index 491edb45..37717b10 100644
--- a/src/email/message/template/command/save.rs
+++ b/src/email/message/template/command/save.rs
@@ -92,7 +92,7 @@ impl TemplateSaveCommand {
             io::stdin()
                 .lock()
                 .lines()
-                .filter_map(Result::ok)
+                .map_while(Result::ok)
                 .collect::<Vec<String>>()
                 .join("\n")
         };
diff --git a/src/email/message/template/command/send.rs b/src/email/message/template/command/send.rs
index 4654f2be..3b798eb3 100644
--- a/src/email/message/template/command/send.rs
+++ b/src/email/message/template/command/send.rs
@@ -113,7 +113,7 @@ impl TemplateSendCommand {
             io::stdin()
                 .lock()
                 .lines()
-                .filter_map(Result::ok)
+                .map_while(Result::ok)
                 .collect::<Vec<_>>()
                 .join("\n")
         };