diff --git a/res/layout/chat_bubble_incoming.xml b/res/layout/chat_bubble_incoming.xml
index b4cabbd4f..b442b3db2 100644
--- a/res/layout/chat_bubble_incoming.xml
+++ b/res/layout/chat_bubble_incoming.xml
@@ -1,100 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/bubble"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
    	android:gravity="left"
     android:orientation="horizontal">
 
-	<LinearLayout
-		android:background="@drawable/resizable_chat_bubble_incoming"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:padding="10dp"
-		android:orientation="horizontal" >
-
-		<RelativeLayout
-			android:id="@+id/avatar_layout"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content">
-
-			<ImageView
-				android:id="@+id/contact_picture"
-				android:src="@drawable/avatar"
-				android:contentDescription="@string/content_description_contact_picture"
-				android:layout_width="40dp"
-				android:layout_height="40dp"/>
-
-			<ImageView
-				android:id="@+id/mask"
-				android:src="@drawable/avatar_chat_mask"
-				android:contentDescription="@string/content_description_contact_picture"
-				android:layout_width="40dp"
-				android:layout_height="40dp"/>
-
-		</RelativeLayout>
-
-		<LinearLayout
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:orientation="vertical"
-			android:paddingLeft="10dp">
-
-			<TextView
-				android:id="@+id/contact_header"
-				style="@style/font9"
-				android:singleLine="true"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"/>
-
-			<TextView
-				android:id="@+id/message"
-				style="@style/font11"
-				android:linksClickable="true"
-				android:autoLink="web"
-				android:visibility="gone"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"/>
-
-			<ImageView
-				android:id="@+id/image"
-				android:layout_width="150dp"
-				android:layout_height="150dp"
-				android:scaleType="centerInside"
-				android:visibility="gone"
-				android:maxWidth="250dp"
-				android:maxHeight="250dp"/>
-
-			<RelativeLayout
-				android:id="@+id/file_transfer_layout"
-				android:visibility="gone"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content">
-
-				<ProgressBar
-					android:id="@+id/progress_bar"
-					style="@android:style/Widget.ProgressBar.Horizontal"
-					android:paddingRight="5dp"
-					android:layout_marginTop="10dp"
-					android:layout_marginBottom="10dp"
-					android:layout_width="150dp"
-					android:layout_height="5dp"/>
-
-				<Button
-					android:id="@+id/accept_download"
-					android:text="@string/accept"
-					android:background="@drawable/resizable_assistant_button"
-					style="@style/font8"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_below="@id/progress_bar"/>
-
-			</RelativeLayout>
-		</LinearLayout>
-	</LinearLayout>
-
 	<CheckBox
-		android:id="@+id/delete"
+		android:id="@+id/delete_message"
 		android:button="@drawable/checkbox"
 		android:contentDescription="@string/content_description_delete"
 		android:layout_marginLeft="5dp"
@@ -104,4 +17,99 @@
 		android:adjustViewBounds="true"
 		android:layout_alignParentRight="true"
 		android:visibility="gone" />
-</LinearLayout>
\ No newline at end of file
+
+	<LinearLayout
+		android:id="@+id/message_content"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_toLeftOf="@id/delete_message">
+
+		<LinearLayout
+			android:background="@drawable/resizable_chat_bubble_incoming"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:padding="10dp"
+			android:orientation="horizontal">
+
+			<RelativeLayout
+				android:id="@+id/avatar_layout"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content">
+
+				<ImageView
+					android:id="@+id/contact_picture"
+					android:src="@drawable/avatar"
+					android:contentDescription="@string/content_description_contact_picture"
+					android:layout_width="40dp"
+					android:layout_height="40dp"/>
+
+				<ImageView
+					android:id="@+id/mask"
+					android:src="@drawable/avatar_chat_mask"
+					android:contentDescription="@string/content_description_contact_picture"
+					android:layout_width="40dp"
+					android:layout_height="40dp"/>
+
+			</RelativeLayout>
+
+			<LinearLayout
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:orientation="vertical"
+				android:paddingLeft="10dp">
+
+				<TextView
+					android:id="@+id/contact_header"
+					style="@style/font9"
+					android:singleLine="true"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"/>
+
+				<TextView
+					android:id="@+id/message"
+					style="@style/font11"
+					android:linksClickable="true"
+					android:autoLink="web"
+					android:visibility="gone"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"/>
+
+				<ImageView
+					android:id="@+id/image"
+					android:layout_width="150dp"
+					android:layout_height="150dp"
+					android:scaleType="centerInside"
+					android:visibility="gone"
+					android:maxWidth="250dp"
+					android:maxHeight="250dp"/>
+
+				<RelativeLayout
+					android:id="@+id/file_transfer_layout"
+					android:visibility="gone"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content">
+
+					<ProgressBar
+						android:id="@+id/progress_bar"
+						style="@android:style/Widget.ProgressBar.Horizontal"
+						android:paddingRight="5dp"
+						android:layout_marginTop="10dp"
+						android:layout_marginBottom="10dp"
+						android:layout_width="150dp"
+						android:layout_height="5dp"/>
+
+					<Button
+						android:id="@+id/accept_download"
+						android:text="@string/accept"
+						android:background="@drawable/resizable_assistant_button"
+						style="@style/font8"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_below="@id/progress_bar"/>
+
+				</RelativeLayout>
+			</LinearLayout>
+		</LinearLayout>
+	</LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/chat_bubble_outgoing.xml b/res/layout/chat_bubble_outgoing.xml
index 082a54d49..a96d18751 100644
--- a/res/layout/chat_bubble_outgoing.xml
+++ b/res/layout/chat_bubble_outgoing.xml
@@ -6,7 +6,7 @@
 	android:orientation="horizontal">
 
 	<CheckBox
-		android:id="@+id/delete"
+		android:id="@+id/delete_message"
 		android:button="@drawable/checkbox"
 		android:contentDescription="@string/content_description_delete"
 		android:layout_marginLeft="5dp"
@@ -21,7 +21,7 @@
 		android:background="@drawable/resizable_chat_bubble_outgoing"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_toLeftOf="@id/delete"
+		android:layout_toLeftOf="@id/delete_message"
 		android:orientation="horizontal">
 
 		<ImageView
diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java
index e48610f8a..bdfed8b87 100644
--- a/src/org/linphone/ChatFragment.java
+++ b/src/org/linphone/ChatFragment.java
@@ -24,6 +24,7 @@ import java.io.File;
 
 import android.app.Dialog;
 import android.app.Fragment;
+import android.graphics.Color;
 import android.graphics.Matrix;
 import java.util.ArrayList;
 import java.util.List;
@@ -64,6 +65,7 @@ import android.provider.MediaStore;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.ContextMenu;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -390,14 +392,20 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 			registerForContextMenu(v);
 			RelativeLayout rlayout = new RelativeLayout(context);
 
-			CheckBox deleteChatBubble = (CheckBox) v.findViewById(R.id.delete);
+			CheckBox deleteChatBubble = (CheckBox) v.findViewById(R.id.delete_message);
 
 			if(isEditMode) {
 				deleteChatBubble.setVisibility(View.VISIBLE);
-				RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
-				layoutParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
-				layoutParams.setMargins(0, 10, 0, 10);
-				v.setLayoutParams(layoutParams);
+				if(message.isOutgoing()){
+					RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
+					layoutParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
+					layoutParams.setMargins(100, 10, 10, 10);
+					v.setLayoutParams(layoutParams);
+				} else {
+					LinearLayout message_layout = (LinearLayout) v.findViewById(R.id.message_content);
+					message_layout.setGravity(Gravity.RIGHT);
+				}
+
 				deleteChatBubble.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
 					@Override
 					public void onCheckedChanged(CompoundButton compoundButton, boolean b) {