diff --git a/lib/sup/message-chunks.rb b/lib/sup/message-chunks.rb
index 2fcf8f9..08dcf27 100644
--- a/lib/sup/message-chunks.rb
+++ b/lib/sup/message-chunks.rb
@@ -82,6 +82,7 @@ EOS
                           :sibling_types => sibling_types
         end
 
+      @lines = nil
       if text
         @lines = text.gsub("\r\n", "\n").gsub(/\t/, "        ").gsub(/\r/, "").split("\n")
         @quotable = true
diff --git a/lib/sup/message.rb b/lib/sup/message.rb
index 65aebd5..f19496e 100644
--- a/lib/sup/message.rb
+++ b/lib/sup/message.rb
@@ -60,13 +60,16 @@ class Message
 
   def parse_header header
     header.each { |k, v| header[k.downcase] = v }
-    
+   
+    fakeid = nil
+    fakename = nil
+
     @id =
       if header["message-id"]
         sanitize_message_id header["message-id"]
       else
         returning("sup-faked-" + Digest::MD5.hexdigest(raw_header)) do |id|
-          Redwood::log "faking message-id for message from #@from: #{id}"
+          fakeid = id
         end
       end
     
@@ -74,11 +77,13 @@ class Message
       if header["from"]
         PersonManager.person_for header["from"]
       else
-        name = "Sup Auto-generated Fake Sender <sup@fake.sender.example.com>"
-        Redwood::log "faking from for message #@id: #{name}"
-        PersonManager.person_for name
+        fakename = "Sup Auto-generated Fake Sender <sup@fake.sender.example.com>"
+        PersonManager.person_for fakename
       end
 
+    Redwood::log "faking message-id for message from #@from: #{id}" if fakename
+    Redwood::log "faking from for message #@id: #{fakename}" if fakeid
+
     date = header["date"]
     @date =
       case date