diff --git a/alot/commands/envelope.py b/alot/commands/envelope.py
index <HASH>..<HASH> 100644
--- a/alot/commands/envelope.py
+++ b/alot/commands/envelope.py
@@ -196,7 +196,10 @@ class EditCommand(Command):
 
             # remove to be edited lines from envelope
             del self.envelope[key]
+
             for value in vlist:
+                # remove newlines in values
+                value = value.replace('\n', ' ')
                 headertext += '%s: %s\n' % (key, value)
 
         bodytext = self.envelope.body
don't write newlines to templates

issue #<I>