Merge commit 'origin/unedited-newlines'

Conflicts:

	lib/sup/modes/edit-message-mode.rb

diff --cc lib/sup/modes/edit-message-mode.rb
index 88debb28126c635205ec87e4fcd7504465415928,89476b32f194ccc941f15e095a05cab625cf03da..b63a00b724ae05462894ae43e3e3370431c02a86
--- 1/lib/sup/modes/edit-message-mode.rb
--- 2/lib/sup/modes/edit-message-mode.rb
+++ b/lib/sup/modes/edit-message-mode.rb
@@@ -304,10 -304,9 +304,10 @@@ protecte
    def build_message date
      m = RMail::Message.new
      m.header["Content-Type"] = "text/plain; charset=#{$encoding}"
-     m.body = @body.join
+     m.body = @body.join("\n")
 -    m.body = m.body
      m.body += sig_lines.join("\n") unless $config[:edit_signature]
 +    ## body must end in a newline or GPG signatures will be WRONG!
 +    m.body += "\n" unless m.body =~ /\n\Z/
  
      ## there are attachments, so wrap body in an attachment of its own
      unless @attachments.empty?