diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb
index c2c89d2288f..8f536380eec 100644
--- a/lib/email/receiver.rb
+++ b/lib/email/receiver.rb
@@ -55,7 +55,7 @@ module Email
       raise BadDestinationAddress if dest_infos.empty?
 
       from = @message[:from].address_list.addresses.first
-      user_email = "#{from.local}@#{from.domain}"
+      user_email = from.address
       user_name  = from.display_name
 
       # TODO: deal with suspended/inactive users