diff --git a/app/src/main/java/i2p/bote/android/service/BoteService.java b/app/src/main/java/i2p/bote/android/service/BoteService.java
index defe809..e459462 100644
--- a/app/src/main/java/i2p/bote/android/service/BoteService.java
+++ b/app/src/main/java/i2p/bote/android/service/BoteService.java
@@ -1,5 +1,6 @@
 package i2p.bote.android.service;
 
+import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
@@ -22,8 +23,10 @@ import net.i2p.router.RouterLaunch;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
+import java.util.HashSet;
 import java.util.List;
 
+import javax.mail.Address;
 import javax.mail.MessagingException;
 
 import i2p.bote.I2PBote;
@@ -221,9 +224,10 @@ public class BoteService extends Service implements NetworkStatusListener, NewEm
         NotificationManager nm = (NotificationManager) getSystemService(
                 Context.NOTIFICATION_SERVICE);
 
-        NotificationCompat.Builder b =
-                new NotificationCompat.Builder(this)
-                .setAutoCancel(true);
+        NotificationCompat.Builder b = new NotificationCompat.Builder(this)
+                .setAutoCancel(true)
+                .setSmallIcon(R.drawable.ic_notif)
+                .setDefaults(Notification.DEFAULT_ALL);
 
         try {
             EmailFolder inbox = I2PBote.getInstance().getInbox();
@@ -246,9 +250,11 @@ public class BoteService extends Service implements NetworkStatusListener, NewEm
                 Bitmap picture = BoteHelper.getPictureForAddress(fromAddress);
                 if (picture != null)
                     b.setLargeIcon(picture);
-                else if (!email.isAnonymous())
-                    b.setLargeIcon(BoteHelper.getIdenticonForAddress(fromAddress, 56, 56)); // TODO fix size
-                else
+                else if (!email.isAnonymous()) {
+                    int width = getResources().getDimensionPixelSize(R.dimen.notification_large_icon_width);
+                    int height = getResources().getDimensionPixelSize(R.dimen.notification_large_icon_height);
+                    b.setLargeIcon(BoteHelper.getIdenticonForAddress(fromAddress, width, height));
+                } else
                     b.setSmallIcon(R.drawable.ic_contact_picture);
 
                 b.setContentTitle(BoteHelper.getNameAndShortDestination(
@@ -264,16 +270,18 @@ public class BoteService extends Service implements NetworkStatusListener, NewEm
                 break;
 
             default:
-                b.setSmallIcon(R.drawable.ic_notif);
                 b.setContentTitle(getResources().getQuantityString(
                         R.plurals.n_new_emails, numNew, numNew));
 
+                HashSet<Address> recipients = new HashSet<Address>();
                 String bigText = "";
                 for (Email ne : newEmails) {
+                    recipients.add(BoteHelper.getOneLocalRecipient(ne));
                     bigText += BoteHelper.getNameAndShortDestination(
                             ne.getOneFromAddress());
                     bigText += ": " + ne.getSubject() + "\n";
                 }
+                b.setContentText(BoteHelper.joinAddressNames(recipients));
                 b.setStyle(new NotificationCompat.BigTextStyle().bigText(bigText));
 
                 Intent eli = new Intent(this, EmailListActivity.class);
diff --git a/app/src/main/java/i2p/bote/android/util/BoteHelper.java b/app/src/main/java/i2p/bote/android/util/BoteHelper.java
index 5e00895..08b2e22 100644
--- a/app/src/main/java/i2p/bote/android/util/BoteHelper.java
+++ b/app/src/main/java/i2p/bote/android/util/BoteHelper.java
@@ -23,11 +23,11 @@ import com.lambdaworks.codec.Base64;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
 import javax.mail.Address;
-import javax.mail.Flags.Flag;
 import javax.mail.MessagingException;
 
 import i2p.bote.android.R;
@@ -401,4 +401,18 @@ public class BoteHelper extends GeneralHelper {
                 mListener.onPasswordVerified();
         }
     }
+
+    public static String joinAddressNames(Collection<Address> s) throws PasswordException, GeneralSecurityException, IOException {
+        StringBuilder builder = new StringBuilder();
+        Iterator<Address> iter = s.iterator();
+        while (iter.hasNext()) {
+            String name = getName(iter.next().toString());
+            builder.append(name);
+            if (!iter.hasNext()) {
+                break;
+            }
+            builder.append(", ");
+        }
+        return builder.toString();
+    }
 }
diff --git a/app/src/main/res/values-v11/dimens.xml b/app/src/main/res/values-v11/dimens.xml
new file mode 100644
index 0000000..085c88b
--- /dev/null
+++ b/app/src/main/res/values-v11/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="notification_large_icon_width">@android:dimen/notification_large_icon_width</dimen>
+    <dimen name="notification_large_icon_height">@android:dimen/notification_large_icon_height</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 9247f32..f2066b4 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -26,6 +26,9 @@
 
     <dimen name="listitem_height_three_lines">88dp</dimen>
 
+    <dimen name="notification_large_icon_width">64dp</dimen>
+    <dimen name="notification_large_icon_height">64dp</dimen>
+
     <dimen name="contact_chip_height">32dp</dimen>
     <dimen name="contact_chip_main_margins">8dp</dimen>
     <dimen name="contact_chip_right_margin">12dp</dimen>