diff options
Diffstat (limited to 'app/models/incoming_message.rb')
| -rw-r--r-- | app/models/incoming_message.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index 1cc81a782..feef8fb71 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -125,9 +125,9 @@ class IncomingMessage < ActiveRecord::Base self.sent_at = self.mail.date || self.created_at self.subject = self.mail.subject self.mail_from = MailHandler.get_from_name(self.mail) - begin + if self.from_email self.mail_from_domain = PublicBody.extract_domain_from_email(self.from_email) - rescue NoMethodError + else self.mail_from_domain = "" end self.valid_to_reply_to = self._calculate_valid_to_reply_to |