Enclosed messages as proper sub-parts

Raw message closed by default.
In-lined sub-parts of the enclosed message.

diff --git a/lib/sup/message-chunks.rb b/lib/sup/message-chunks.rb
index ba8b84641f294d3820896ddb53f06dd2169c76b9..7eabcdf042ad5f29bc5b9423ff7c66d6c16e4361 100644 (file)
--- a/lib/sup/message-chunks.rb
+++ b/lib/sup/message-chunks.rb
@@ -206,7 +206,7 @@ EOS
     def inlineable?; false end
     def quotable?; false end
     def expandable?; true end
-    def initial_state; :open end
+    def initial_state; :closed end
     def viewable?; false end
 
     def patina_color; :generic_notice_patina_color end

diff --git a/lib/sup/message.rb b/lib/sup/message.rb
index 2cf97c8ce482c69097d6b8f014d06ff0be6060c5..944dd88947207295e143fb3df1bf0c131ba83511 100644 (file)
--- a/lib/sup/message.rb
+++ b/lib/sup/message.rb
@@ -392,7 +392,8 @@ private
       payload = RMail::Parser.read(m.body)
       from = payload.header.from.first
       from_person = from ? PersonManager.person_for(from.format) : nil
-      [Chunk::EnclosedMessage.new(from_person, payload.to_s)]
+      [Chunk::EnclosedMessage.new(from_person, payload.to_s)] +
+        message_to_chunks(payload, encrypted)
     else
       filename =
         ## first, paw through the headers looking for a filename