diff --git a/res/layout/contact_edit_row.xml b/res/layout/contact_edit_row.xml
index 87ad39569..4c6b13a80 100644
--- a/res/layout/contact_edit_row.xml
+++ b/res/layout/contact_edit_row.xml
@@ -2,7 +2,9 @@
 <TableRow xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:gravity="center_vertical">
+	android:layout_margin="2dp"
+	android:gravity="center_vertical"
+	android:padding="10dp">
    
    	<ImageView
    	    android:contentDescription="@string/content_description_delete"
diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java
index 1fc292921..3e7301b70 100644
--- a/src/org/linphone/ChatFragment.java
+++ b/src/org/linphone/ChatFragment.java
@@ -369,6 +369,8 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 		latestImageMessages = null;
 		message.removeTextChangedListener(textWatcher);
 		removeVirtualKeyboardVisiblityListener();
+
+		LinphoneService.instance().removeMessageNotification();
 		
 		super.onPause();