diff --git a/atomstrom.py b/atomstrom.py
index 6ba6ceb..dfa67b4 100755
--- a/atomstrom.py
+++ b/atomstrom.py
@@ -197,6 +197,7 @@ def mail_daily_digest(session, sender, receiver, prefix):
         subject = '%s (%s) - %d entries' % (today.strftime('%y%m%d'), today.strftime('%A'), count)
         if prefix != '':
             subject = '%s %s' % (prefix, subject)
+        sender = '%s <%s>' % ('Atomstrom', sender)
         send_mail(sender, receiver, subject, body)
         for feed, feedinfo, entry in entries:
             entry.sent = datetime.now()
@@ -213,6 +214,7 @@ def mail_single_entry(feed, feedinfo, entry, sender, receiver, prefix):
     body = '%s\n\n' % get_entry_text(entry)
     body = body + '%s\n' % feedinfo.link
     body = body + '%s\n' % link
+    sender = '%s <%s>' % (feedinfo.title, sender)
     send_mail(sender, receiver, subject, body)
     entry.sent = datetime.now()