Merge branch 'master' into next

Conflicts:
	lib/sup/message.rb

diff --cc lib/sup/message.rb
index f02817a7e4d003263bb4867567f772927648b8ec,39862b9f643c2dd66aa0ebaf877a00a39a30559c..c69b9e30327ff6e51d70b8b2395f47107c0dc68e
--- 1/lib/sup/message.rb
--- 2/lib/sup/message.rb
+++ b/lib/sup/message.rb
@@@ -434,20 -409,15 +434,24 @@@ privat
  
        chunks
      elsif m.header.content_type == "message/rfc822"
-       payload = RMail::Parser.read(m.body)
-       from = payload.header.from.first ? payload.header.from.first.format : ""
-       to = payload.header.to.map { |p| p.format }.join(", ")
-       cc = payload.header.cc.map { |p| p.format }.join(", ")
-       subj = payload.header.subject
-       subj = subj ? Message.normalize_subj(payload.header.subject.gsub(/\s+/, " ").gsub(/\s+$/, "")) : subj
-       if Rfc2047.is_encoded? subj
-         subj = Rfc2047.decode_to $encoding, subj
+       if m.body
+         payload = RMail::Parser.read(m.body)
 -        from = payload.header.from.first
 -        from_person = from ? Person.from_address(from.format) : nil
 -        [Chunk::EnclosedMessage.new(from_person, payload.to_s)] +
 -          message_to_chunks(payload, encrypted)
++        from = payload.header.from.first ? payload.header.from.first.format : ""
++        to = payload.header.to.map { |p| p.format }.join(", ")
++        cc = payload.header.cc.map { |p| p.format }.join(", ")
++        subj = payload.header.subject
++        subj = subj ? Message.normalize_subj(payload.header.subject.gsub(/\s+/, " ").gsub(/\s+$/, "")) : subj
++        if Rfc2047.is_encoded? subj
++          subj = Rfc2047.decode_to $encoding, subj
++        end
++        msgdate = payload.header.date
++        from_person = from ? Person.from_address(from) : nil
++        to_people = to ? Person.from_address_list(to) : nil
++        cc_people = cc ? Person.from_address_list(cc) : nil
++        [Chunk::EnclosedMessage.new(from_person, to_people, cc_people, msgdate, subj)] + message_to_chunks(payload, encrypted)
+       else
+         [Chunk::EnclosedMessage.new(nil, "")]
        end
-       msgdate = payload.header.date
-       from_person = from ? Person.from_address(from) : nil
-       to_people = to ? Person.from_address_list(to) : nil
-       cc_people = cc ? Person.from_address_list(cc) : nil
-       [Chunk::EnclosedMessage.new(from_person, to_people, cc_people, msgdate, subj)] + message_to_chunks(payload, encrypted)
      else
        filename =
          ## first, paw through the headers looking for a filename