diff --git a/lib/sup/modes/reply_mode.rb b/lib/sup/modes/reply_mode.rb
index a361f54c9..bcaf182d3 100644
--- a/lib/sup/modes/reply_mode.rb
+++ b/lib/sup/modes/reply_mode.rb
@@ -88,10 +88,6 @@ def initialize message, type_arg=nil
     ## next, cc:
     cc = (@m.to + @m.cc - [from, to]).uniq
 
-    if to.full_address == "sup@fake.sender.example.com"
-    	to = nil
-    end
-
     ## one potential reply type is "reply to recipient". this only happens
     ## in certain cases:
     ## if there's no cc, then the sender is the person you want to reply
@@ -101,28 +97,30 @@ def initialize message, type_arg=nil
 
     @headers = {}
     @headers[:recipient] = {
-      "To" => (cc.map { |p| p.full_address == "sup@fake.sender.example.com" ? nil : p.full_address}.compact),
+      "To" => (cc.map { |p| p.email == "sup@fake.sender.example.com" ? nil : p.email}.compact),
       "Cc" => [],
     } if useful_recipient
 
     ## typically we don't want to have a reply-to-sender option if the sender
     ## is a user account. however, if the cc is empty, it's a message to
     ## ourselves, so for the lack of any other options, we'll add it.
-    @headers[:sender] = {
-      "To" => [to.full_address],
-      "Cc" => [],
-    } if !AccountManager.is_account?(to) && !useful_recipient && !to.full_address == "sup@fake.sender.example.com"
+    if !AccountManager.is_account?(to) || !useful_recipient 
+    	@headers[:sender] = {
+      		"To" => [to.full_address],
+      		"Cc" => [],
+    	} unless to.email == "sup@fake.sender.example.com"
+    end
 
     @headers[:user] = {
       "To" => [],
       "Cc" => [],
     }
-
+    
     not_me_ccs = cc.select { |p| !AccountManager.is_account?(p) }
     @headers[:all] = {
       "To" => [to.full_address],
-      "Cc" => (not_me_ccs.map { |p| p.full_address == "sup@fake.sender.example.com" ? nil : p.full_address }.compact),
-    } if !not_me_ccs.empty? && !to.full_address == "sup@fake.sender.example.com"
+      "Cc" => (not_me_ccs.map { |p| p.email == "sup@fake.sender.example.com" ? nil : p.email }.compact),
+    } unless not_me_ccs.empty? or to.email == "sup@fake.sender.example.com"
 
     @headers[:list] = {
       "To" => [@m.list_address.full_address],