diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java
index ddc255514..6cad96653 100644
--- a/src/android/org/linphone/LinphoneManager.java
+++ b/src/android/org/linphone/LinphoneManager.java
@@ -1130,9 +1130,9 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
 		if (!mServiceContext.getResources().getBoolean(R.bool.disable_chat_message_notification)) {
 			if (!cr.canHandleParticipants() || (cr.getNbParticipants() == 1 && getString(R.string.dummy_group_chat_subject).equals(cr.getSubject()))) {
 				if (contact != null) {
-					LinphoneService.instance().displayMessageNotification(from.asStringUriOnly(), contact.getFullName(), contact.getThumbnailUri(), textMessage);
+					LinphoneService.instance().displayMessageNotification(cr.getPeerAddress().asStringUriOnly(), contact.getFullName(), contact.getThumbnailUri(), textMessage);
 				} else {
-					LinphoneService.instance().displayMessageNotification(from.asStringUriOnly(), from.getUsername(), null, textMessage);
+					LinphoneService.instance().displayMessageNotification(cr.getPeerAddress().asStringUriOnly(), from.getUsername(), null, textMessage);
 				}
 			} else {
 				String subject = cr.getSubject();
diff --git a/src/android/org/linphone/activities/LinphoneActivity.java b/src/android/org/linphone/activities/LinphoneActivity.java
index bec5cede6..70d9d1da6 100644
--- a/src/android/org/linphone/activities/LinphoneActivity.java
+++ b/src/android/org/linphone/activities/LinphoneActivity.java
@@ -913,11 +913,6 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
 		return statusFragment;
 	}
 
-	public void removeFromChatList(String sipUri) {
-		ChatRoom chatroom = LinphoneManager.getLc().getChatRoomFromUri(sipUri);
-		chatroom.deleteHistory();
-	}
-
 	public void updateMissedChatCount() {
 		displayMissedChats(getUnreadMessageCount());
 	}