diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index a4309cd0088a9883dd26c27d3c31d47cf303b5b5..e471d46dc2bd6e9c046a6ce68245acaa3e0c43af 100644
--- a/src/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/ConversationActivity.java
@@ -179,7 +179,7 @@ public class ConversationActivity extends XmppActivity {
 				.setText(UIHelper.readableTimeDifference(conv.getLatestMessage().getTimeSent()));
 				
 				ImageView imageView = (ImageView) view.findViewById(R.id.conversation_image);
-				imageView.setImageBitmap(UIHelper.getContactPicture(getItem(position).getContact(), 200, activity.getApplicationContext()));
+				imageView.setImageBitmap(UIHelper.getContactPicture(conv.getContact(), conv.getName(),200, activity.getApplicationContext()));
 				return view;
 			}
 
diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java
index 208f6f6f3e36dd4e64a14881069185ea43883fe9..2aabec8739e0dcc7b5a00261883a9e177faff063 100644
--- a/src/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/eu/siacs/conversations/ui/ConversationFragment.java
@@ -563,12 +563,7 @@ public class ConversationFragment extends Fragment {
 			if (bitmaps.containsKey(name)) {
 				return bitmaps.get(name);
 			} else {
-				Bitmap bm;
-				if (contact == null) {
-					bm = UIHelper.getContactPictureByName(name, 200);
-				} else {
-					bm = UIHelper.getContactPicture(contact, 200, context);
-				}
+				Bitmap bm = UIHelper.getContactPicture(contact, name, 200, context);
 				bitmaps.put(name, bm);
 				return bm;
 			}
diff --git a/src/eu/siacs/conversations/ui/MucDetailsActivity.java b/src/eu/siacs/conversations/ui/MucDetailsActivity.java
index 124fdadc72872b82f1b200b71defeb51e0fdb524..5bd3556cd7463b55267cca56b5034914a1b26f41 100644
--- a/src/eu/siacs/conversations/ui/MucDetailsActivity.java
+++ b/src/eu/siacs/conversations/ui/MucDetailsActivity.java
@@ -162,7 +162,7 @@ public class MucDetailsActivity extends XmppActivity {
 					role.setText(getReadableRole(contact.getRole()));
 					ImageView imageView = (ImageView) view
 							.findViewById(R.id.contact_photo);
-					imageView.setImageBitmap(UIHelper.getContactPictureByName(contact.getName(), 90));
+					imageView.setImageBitmap(UIHelper.getContactPicture(null,contact.getName(), 90,this.getApplicationContext()));
 					membersView.addView(view);
 				}
 			}
diff --git a/src/eu/siacs/conversations/ui/NewConversationActivity.java b/src/eu/siacs/conversations/ui/NewConversationActivity.java
index e4fb6d1461a2185c77dd6bf09437e624f701978d..0ad830ece70797314b53f57f185ba94d80075471 100644
--- a/src/eu/siacs/conversations/ui/NewConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/NewConversationActivity.java
@@ -137,7 +137,7 @@ public class NewConversationActivity extends XmppActivity {
 				contactJid.setText(contact.getJid());
 				ImageView imageView = (ImageView) view
 						.findViewById(R.id.contact_photo);
-					imageView.setImageBitmap(UIHelper.getContactPicture(contact,90,this.getContext()));
+					imageView.setImageBitmap(UIHelper.getContactPicture(contact,null,90,this.getContext()));
 				return view;
 			}
 		};
diff --git a/src/eu/siacs/conversations/utils/UIHelper.java b/src/eu/siacs/conversations/utils/UIHelper.java
index 528a0bb2e4652e5e4e332eda062fd776dbfc59bc..544f9429881948c5a0b313013da1b3533cf822cd 100644
--- a/src/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/eu/siacs/conversations/utils/UIHelper.java
@@ -91,9 +91,9 @@ public class UIHelper {
 		return bitmap;
 	}
 	
-	public static Bitmap getContactPicture(Contact contact, int size, Context context) {
+	public static Bitmap getContactPicture(Contact contact, String fallback, int size, Context context) {
 		if (contact==null) {
-			return getUnknownContactPicture(contact.getDisplayName(), size);
+			return getUnknownContactPicture(fallback, size);
 		}
 		String uri = contact.getProfilePhoto();
 		if (uri==null) {
@@ -171,7 +171,7 @@ public class UIHelper {
 					conversation.getName(),
 					(int) res
 							.getDimension(android.R.dimen.notification_large_icon_width)));*/
-			mBuilder.setLargeIcon(UIHelper.getContactPicture(conversation.getContact(), (int) res
+			mBuilder.setLargeIcon(UIHelper.getContactPicture(conversation.getContact(), conversation.getName(), (int) res
 							.getDimension(android.R.dimen.notification_large_icon_width), context));
 			mBuilder.setContentTitle(conversation.getName());
 			if (notify) {
@@ -315,8 +315,4 @@ public class UIHelper {
 		}
 		return getUnknownContactPicture(account.getJid(), size);
 	}
-
-	public static Bitmap getContactPictureByName(String name, int size) {
-		return getUnknownContactPicture(name, size);
-	}
 }