Merge branch 'development' of https://github.com/strb/Conversations into strb-development

1 files changed, 6 insertions, 1 deletions

diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java
index 04fb6f92..3796f83e 100644
--- a/src/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/eu/siacs/conversations/ui/ConversationFragment.java
@@ -614,7 +614,12 @@ public class ConversationFragment extends Fragment {
 			if (bitmaps.containsKey(name)) {
 				return bitmaps.get(name);
 			} else {
-				Bitmap bm = UIHelper.getContactPicture(contact, name, 200, context);
+				Bitmap bm;
+				if (contact != null){
+					bm = UIHelper.getContactPicture(contact, 200, context);
+				} else {
+					bm = UIHelper.getContactPicture(name, 200, context);
+				}
 				bitmaps.put(name, bm);
 				return bm;
 			}