vmail 0.5.8 → 0.5.9

data/lib/vmail/imap_client.rb

@@ -515,10 +515,10 @@ EOF
     end
 
 
-    def new_message_template
+    def new_message_template(subject = nil)
       headers = {'from' => "#{@name} <#{@username}>",
         'to' => nil,
-        'subject' => nil
+        'subject' => subject
       }
       format_headers(headers) + "\n\n" + signature
     end
@@ -550,7 +550,13 @@ EOF
 
     def forward_template
       original_body = @current_message.split(/\n-{20,}\n/, 2)[1]
-      new_message_template + 
+      formatter = Vmail::MessageFormatter.new(@current_mail)
+      headers = formatter.extract_headers
+      subject = headers['subject']
+      if subject !~ /Fwd: /
+        subject = "Fwd: #{subject}"
+      end
+      new_message_template(subject) + 
         "\n---------- Forwarded message ----------\n" +
         original_body + signature
     end

data/lib/vmail/reply_template.rb

@@ -23,6 +23,11 @@ module Vmail
       {'from' => "#@name <#@username>", 'to' => primary_recipient, 'cc' => cc, 'subject' => subject, :body => body}
     end
 
+    # just stick this here
+    def forward_headers
+
+    end
+
     def primary_recipient
       from = @mail.header['from']
       reply_to = @mail.header['reply-to']

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = "0.5.8"
+  VERSION = "0.5.9"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 8
-  version: 0.5.8
+  - 9
+  version: 0.5.9
 platform: ruby
 authors: 
 - Daniel Choi