fixed #470

1 files changed, 30 insertions, 27 deletions

diff --git a/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 876fbfe7..acf6ac3f 100644
--- a/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -406,6 +406,36 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 			return view;
 		}
 
+		if (viewHolder.contact_picture != null) {
+			viewHolder.contact_picture
+					.setOnClickListener(new OnClickListener() {
+
+						@Override
+						public void onClick(View v) {
+							if (MessageAdapter.this.mOnContactPictureClickedListener != null) {
+								MessageAdapter.this.mOnContactPictureClickedListener
+										.onContactPictureClicked(item);
+								;
+							}
+
+						}
+					});
+			viewHolder.contact_picture
+					.setOnLongClickListener(new OnLongClickListener() {
+
+						@Override
+						public boolean onLongClick(View v) {
+							if (MessageAdapter.this.mOnContactPictureLongClickedListener != null) {
+								MessageAdapter.this.mOnContactPictureLongClickedListener
+										.onContactPictureLongClicked(item);
+								return true;
+							} else {
+								return false;
+							}
+						}
+					});
+		}
+
 		if (type == RECEIVED) {
 			if (item.getConversation().getMode() == Conversation.MODE_MULTI) {
 				Contact contact = item.getContact();
@@ -420,33 +450,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 					viewHolder.contact_picture.setImageBitmap(mBitmapCache.get(
 							name, getContext()));
 				}
-				viewHolder.contact_picture
-						.setOnClickListener(new OnClickListener() {
-
-							@Override
-							public void onClick(View v) {
-								if (MessageAdapter.this.mOnContactPictureClickedListener != null) {
-									MessageAdapter.this.mOnContactPictureClickedListener
-											.onContactPictureClicked(item);
-									;
-								}
-
-							}
-						});
-				viewHolder.contact_picture
-						.setOnLongClickListener(new OnLongClickListener() {
-
-							@Override
-							public boolean onLongClick(View v) {
-								if (MessageAdapter.this.mOnContactPictureLongClickedListener != null) {
-									MessageAdapter.this.mOnContactPictureLongClickedListener
-											.onContactPictureLongClicked(item);
-									return true;
-								} else {
-									return false;
-								}
-							}
-						});
 			}
 		}