diff --git a/res/drawable-xhdpi/chat_photo_default.png b/res/drawable-xhdpi/chat_photo_default.png
deleted file mode 100644
index 6867dafa7..000000000
Binary files a/res/drawable-xhdpi/chat_photo_default.png and /dev/null differ
diff --git a/res/drawable-xhdpi/chat_photo_disabled.png b/res/drawable-xhdpi/chat_photo_disabled.png
deleted file mode 100644
index 1a3152ffe..000000000
Binary files a/res/drawable-xhdpi/chat_photo_disabled.png and /dev/null differ
diff --git a/res/drawable-xhdpi/chat_picture_default.png b/res/drawable-xhdpi/chat_picture_default.png
index 505d1c8dd..f5c3bf949 100644
Binary files a/res/drawable-xhdpi/chat_picture_default.png and b/res/drawable-xhdpi/chat_picture_default.png differ
diff --git a/res/drawable-xhdpi/chat_send_default.png b/res/drawable-xhdpi/chat_send_default.png
index 22f2e496f..05a49484f 100644
Binary files a/res/drawable-xhdpi/chat_send_default.png and b/res/drawable-xhdpi/chat_send_default.png differ
diff --git a/res/drawable-xhdpi/list_details_default.png b/res/drawable-xhdpi/list_details_default.png
index 0969ea202..660043029 100644
Binary files a/res/drawable-xhdpi/list_details_default.png and b/res/drawable-xhdpi/list_details_default.png differ
diff --git a/res/drawable/chat_send_message.xml b/res/drawable/chat_send_message.xml
index 2a8bb6a57..8cc2b9dc4 100644
--- a/res/drawable/chat_send_message.xml
+++ b/res/drawable/chat_send_message.xml
@@ -2,8 +2,6 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" 
         android:drawable="@drawable/chat_send_over" />
-    <item android:state_enabled="false" 
-        android:drawable="@drawable/chat_send_default" />
     <item
          android:drawable="@drawable/chat_send_default" />
 </selector>
diff --git a/res/drawable/chat_send_picture.xml b/res/drawable/chat_send_picture.xml
index b28c8c74a..84c43169c 100644
--- a/res/drawable/chat_send_picture.xml
+++ b/res/drawable/chat_send_picture.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false" 
-        android:drawable="@drawable/chat_photo_disabled" />
+	<item android:state_pressed="true"
+        android:drawable="@drawable/chat_picture_over" />
     <item
-         android:drawable="@drawable/chat_photo_default" />
+         android:drawable="@drawable/chat_picture_default" />
 </selector>
 
diff --git a/res/layout/chat.xml b/res/layout/chat.xml
index dcab9e76b..3ae7ef855 100644
--- a/res/layout/chat.xml
+++ b/res/layout/chat.xml
@@ -104,37 +104,34 @@
 	    android:orientation="vertical"
 	    android:layout_alignParentBottom="true"
 	    android:layout_centerHorizontal="true"
-   		android:background="@color/colorD">
+   		android:background="@color/colorF">
        
 	    <RelativeLayout 
 	        android:id="@+id/messageLayout"
 		    android:layout_width="match_parent"
 		    android:layout_height="wrap_content">
 	        
-	        <TextView
+	        <ImageView
 	            android:id="@+id/sendPicture"
-	            android:gravity="center"
+				android:padding="5dp"
+				android:scaleType="center"
 	            android:textColor="@drawable/text_color"
 	            android:layout_width="wrap_content"
 	            android:layout_height="wrap_content"
 	            android:layout_alignParentLeft="true"
 	            android:layout_centerVertical="true"
-	            android:drawableTop="@drawable/chat_send_picture"
-	            android:paddingLeft="10dp"
-	            android:paddingRight="10dp" />
+	            android:src="@drawable/chat_send_picture" />
 	        
-	        <TextView
+	        <ImageView
 	            android:id="@+id/sendMessage"
 	            android:gravity="center"
-	            android:textColor="@drawable/text_color"
+				android:padding="5dp"
+				android:scaleType="center"
 	            android:layout_width="wrap_content"
 	            android:layout_height="wrap_content"
-				android:drawableTop="@drawable/chat_send_message"
-	            android:paddingRight="10dp"
-	            android:paddingLeft="10dp"
+				android:src="@drawable/chat_send_message"
 				android:layout_alignTop="@+id/message"
-				android:layout_alignParentRight="true"
-				android:layout_alignParentEnd="true"/>
+				android:layout_alignParentRight="true"/>
 	        
 	        <EditText
                 android:imeOptions="flagNoExtractUi"
@@ -212,11 +209,12 @@
 		android:id="@+id/chatMessageList"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
+		android:layout_margin="10dp"
 		android:divider="@android:color/transparent"
 		android:stackFromBottom="true"
 		android:transcriptMode="alwaysScroll"
 		android:cacheColorHint="@color/transparent"
-		android:dividerHeight="1dp"
+		android:dividerHeight="10dp"
 		android:layout_above="@id/remoteComposing"
 		android:layout_below="@+id/relativeLayout"/>
 
diff --git a/res/layout/chat_bubble_alt_incoming.xml b/res/layout/chat_bubble_alt_incoming.xml
deleted file mode 100644
index 5a5cea187..000000000
--- a/res/layout/chat_bubble_alt_incoming.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/bubble"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal" >
-    
-    <TextView 
-        android:id="@+id/message"
-        android:visibility="gone"
-        android:textColor="@android:color/black"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="1" />
-    
-    <ImageView
-        android:id="@+id/image"
-        android:visibility="gone"
-        android:adjustViewBounds="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" 
-        android:layout_weight="1"
-        android:maxWidth="250dp"
-        android:maxHeight="250dp" />
-    
-    <Button
-        android:id="@+id/download"
-        android:text="@string/download_image"
-        android:visibility="gone"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="1" />
-    
-    <ProgressBar 
-        android:id="@+id/spinner"
-        android:visibility="gone"
-        android:indeterminate="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="1" />
-
-    <TextView 
-        android:id="@+id/time"
-        android:textColor="@android:color/darker_gray"
-        android:textSize="12sp"
-        android:gravity="bottom"
-        android:singleLine="true"
-        android:paddingLeft="5dp"
-        android:linksClickable="true"
-		android:autoLink="web"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent" />
-    
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/chat_bubble_alt_outgoing.xml b/res/layout/chat_bubble_alt_outgoing.xml
deleted file mode 100644
index 8b8f7fdf3..000000000
--- a/res/layout/chat_bubble_alt_outgoing.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/bubble"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal" >
-
-    <ImageView 
-	    android:contentDescription="@string/content_description_message_status"
-        android:id="@+id/status"
-        android:visibility="gone"
-        android:layout_gravity="bottom"
-	    android:layout_width="wrap_content"
-	    android:layout_height="wrap_content"
-	    android:adjustViewBounds="true" />
-    
-    <TextView 
-        android:id="@+id/time"
-        android:textColor="@android:color/darker_gray"
-        android:textSize="12sp"
-        android:gravity="bottom"
-        android:singleLine="true"
-        android:paddingRight="5dp"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent" />
-    
-    <TextView 
-        android:id="@+id/message"
-        android:visibility="gone"
-        android:linksClickable="true"
-		android:autoLink="web"
-        android:textColor="@android:color/black"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-    
-    <ImageView
-        android:id="@+id/image"
-        android:adjustViewBounds="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:maxWidth="250dp"
-        android:maxHeight="250dp" />
-    
-    <Button
-        android:id="@+id/download"
-        android:text="@string/download_image"
-        android:visibility="gone"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-    
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/chat_bubble_incoming.xml b/res/layout/chat_bubble_incoming.xml
index 97a41d860..d189aa4db 100644
--- a/res/layout/chat_bubble_incoming.xml
+++ b/res/layout/chat_bubble_incoming.xml
@@ -1,34 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/bubble"
+	android:padding="10dp"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
    	android:gravity="left"
-    android:orientation="vertical" >
-    
-    <TextView 
-        android:id="@+id/message"
-    	android:layout_gravity="left"
-        android:visibility="gone"
-        android:textColor="@android:color/black"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-    
-    <ImageView
-        android:id="@+id/image"
-        android:visibility="gone"
-        android:adjustViewBounds="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:maxWidth="250dp"
-        android:maxHeight="250dp" />
-    
-    <Button
-        android:id="@+id/download"
-        android:visibility="gone"
-        android:text="@string/download_image"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+    android:orientation="horizontal" >
+
+
+	<ImageView
+		android:id="@+id/contact_picture"
+		android:layout_width="40dp"
+		android:layout_height="40dp"
+		android:src="@drawable/avatar"/>
+
+	<LinearLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		android:paddingLeft="10dp">
+
+		<TextView
+			android:id="@+id/contact_header"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:singleLine="true"
+			android:paddingRight="5dp"
+			style="@style/font3"/>
+
+		<TextView
+			android:id="@+id/message"
+			android:layout_gravity="left"
+			android:visibility="gone"
+			android:linksClickable="true"
+			android:autoLink="web"
+			android:textColor="@android:color/black"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content" />
+
+		<ImageView
+			android:id="@+id/image"
+			android:adjustViewBounds="true"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:maxWidth="250dp"
+			android:maxHeight="250dp" />
+
+	</LinearLayout>
     
     <ProgressBar 
         android:id="@+id/spinner"
diff --git a/res/layout/chat_bubble_outgoing.xml b/res/layout/chat_bubble_outgoing.xml
index a62748c02..460786fd5 100644
--- a/res/layout/chat_bubble_outgoing.xml
+++ b/res/layout/chat_bubble_outgoing.xml
@@ -1,60 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/bubble"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:gravity="left"
-    android:orientation="vertical" >
-    
-    <TextView 
-        android:id="@+id/message"
-    	android:layout_gravity="right"
-        android:visibility="gone"
-        android:textColor="@android:color/black"
-        android:linksClickable="true"
-		android:autoLink="web"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-    
-    <ImageView
-        android:id="@+id/image"
-        android:visibility="gone"
-        android:adjustViewBounds="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:maxWidth="250dp"
-        android:maxHeight="250dp" />
-    
-    <Button
-        android:id="@+id/download"
-        android:visibility="gone"
-        android:text="@string/download_image"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+	  android:id="@+id/bubble"
+	  android:padding="10dp"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:orientation="horizontal" >
+
+	<ImageView
+		android:id="@+id/contact_picture"
+		android:layout_width="40dp"
+		android:layout_height="40dp"
+		android:src="@drawable/avatar"/>
+
+	<LinearLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		android:paddingLeft="10dp">
+
+		<TextView
+			android:id="@+id/contact_header"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:singleLine="true"
+			android:paddingRight="5dp"
+			style="@style/font3"/>
+
+		<TextView
+			android:id="@+id/message"
+			android:visibility="gone"
+			android:linksClickable="true"
+			android:autoLink="web"
+			android:textColor="@android:color/black"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content" />
+
+		<ImageView
+			android:id="@+id/image"
+			android:adjustViewBounds="true"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:maxWidth="250dp"
+			android:maxHeight="250dp" />
 
-    <LinearLayout
-	    android:layout_width="wrap_content"
-	    android:layout_height="wrap_content"
-	    android:layout_gravity="right"
-	    android:orientation="horizontal" >
-	    
-	    <TextView 
-	        android:id="@+id/time"
-	        android:textColor="@android:color/darker_gray"
-	        android:textSize="12sp"
-	        android:singleLine="true"
-	        android:paddingRight="5dp"
-	        android:layout_width="match_parent"
-	        android:layout_height="wrap_content" />
-	
-		<ImageView 
-		    android:contentDescription="@string/content_description_message_status"
-	        android:id="@+id/status"
-	        android:layout_weight="1"
-		    android:layout_width="0dip"
-		    android:layout_height="wrap_content"
-		    android:adjustViewBounds="true" />
-	
 	</LinearLayout>
-    
+
+	<ImageView
+		android:contentDescription="@string/content_description_message_status"
+		android:id="@+id/status"
+		android:visibility="gone"
+		android:layout_gravity="bottom"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:adjustViewBounds="true" />
+
+	<Button
+		android:id="@+id/download"
+		android:text="@string/download_image"
+		android:visibility="gone"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index 90a339b37..052f72835 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -47,7 +47,6 @@
 	<bool name="only_display_username_if_unknown">true</bool> <!-- Display username for all sip addresses (if not in contact and display name empty) -->
 	<bool name="never_display_sip_addresses">false</bool> <!-- To use only with the above setting set to true -->
 	<bool name="display_messages_time_and_status">true</bool> <!-- Used to show the time of each message arrival -->
-	<bool name="display_time_aside">false</bool> <!-- if display_messages_time = true, display time on the side of the message instead of below -->
 
 	<bool name="enable_linphone_friends">false</bool>
 	<bool name="use_linphone_tag">true</bool>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 81191aaaa..e73f8e121 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -19,7 +19,7 @@
 
 	<style name="font3" parent="@android:style/TextAppearance.Medium">
 		<item name="android:textColor">@color/colorA</item>
-		<item name="android:textSize">20sp</item>
+		<item name="android:textSize">18sp</item>
 	</style>
 
 	<style name="font4" parent="@android:style/TextAppearance.Medium">
diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java
index 1968276e0..f0e64dc70 100644
--- a/src/org/linphone/ChatFragment.java
+++ b/src/org/linphone/ChatFragment.java
@@ -99,9 +99,9 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 	private String displayName;
 	private String pictureUri;
 	private EditText message;
-	private ImageView cancelUpload, edit, selectAll, deselectAll, startCall, delete;
+	private ImageView cancelUpload, edit, selectAll, deselectAll, startCall, delete, sendImage, sendMessage;
 	private LinearLayout topBar;
-	private TextView sendImage, sendMessage, contactName, remoteComposing;
+	private TextView contactName, remoteComposing;
 	private ImageView back;
 	private RelativeLayout uploadLayout, textLayout;
 	private ListView messagesList;
@@ -144,7 +144,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 		progressBar = (ProgressBar) view.findViewById(R.id.progressbar);
 		topBar = (LinearLayout) view.findViewById(R.id.topbar);
 
-		sendMessage = (TextView) view.findViewById(R.id.sendMessage);
+		sendMessage = (ImageView) view.findViewById(R.id.sendMessage);
 		sendMessage.setOnClickListener(this);
 
 		remoteComposing = (TextView) view.findViewById(R.id.remoteComposing);
@@ -178,7 +178,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 			message.setMaxLines(1);
 		}
 
-		sendImage = (TextView) view.findViewById(R.id.sendPicture);
+		sendImage = (ImageView) view.findViewById(R.id.sendPicture);
 		if (!getResources().getBoolean(R.bool.disable_chat_send_file)) {
 			sendImage.setOnClickListener(new View.OnClickListener() {
 				@Override
diff --git a/src/org/linphone/ui/BubbleChat.java b/src/org/linphone/ui/BubbleChat.java
index a40810d80..ea1dc3826 100644
--- a/src/org/linphone/ui/BubbleChat.java
+++ b/src/org/linphone/ui/BubbleChat.java
@@ -25,6 +25,7 @@ import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Map.Entry;
 
+import org.linphone.LinphoneUtils;
 import org.linphone.R;
 import org.linphone.core.LinphoneChatMessage;
 import org.linphone.core.LinphoneChatMessage.State;
@@ -88,32 +89,26 @@ public class BubbleChat {
     	
     	if (message.isOutgoing()) {
     		layoutParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
+			layoutParams.setMargins(10, 0, 10, 0);
     		view.setBackgroundResource(R.drawable.resizable_chat_bubble_outgoing);
     	}
     	else {
     		layoutParams.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
+			layoutParams.setMargins(10, 0, 10, 0);
     		view.setBackgroundResource(R.drawable.resizable_chat_bubble_incoming);
     	}
 
-    	layoutParams.setMargins(10, 0, 10, 0);
-    	
     	view.setId(message.getStorageId());	
     	view.setLayoutParams(layoutParams);
     	
 		LinearLayout layout;
-    	if (context.getResources().getBoolean(R.bool.display_time_aside)) {
-	    	if (message.isOutgoing()) {
-	    		layout = (LinearLayout) LayoutInflater.from(context).inflate(R.layout.chat_bubble_alt_outgoing, null);
-	    	} else {
-	    		layout = (LinearLayout) LayoutInflater.from(context).inflate(R.layout.chat_bubble_alt_incoming, null);
-	    	}
-    	} else {
-    		if (message.isOutgoing()) {
-	    		layout = (LinearLayout) LayoutInflater.from(context).inflate(R.layout.chat_bubble_outgoing, null);
-	    	} else {
-	    		layout = (LinearLayout) LayoutInflater.from(context).inflate(R.layout.chat_bubble_incoming, null);
-	    	}
-    	}
+
+		if (message.isOutgoing()) {
+			layout = (LinearLayout) LayoutInflater.from(context).inflate(R.layout.chat_bubble_outgoing, null);
+		} else {
+			layout = (LinearLayout) LayoutInflater.from(context).inflate(R.layout.chat_bubble_incoming, null);
+		}
+
 
     	String externalBodyUrl = message.getExternalBodyUrl();
     	LinphoneContent fileTransferContent = message.getFileTransferInformation();
@@ -158,8 +153,8 @@ public class BubbleChat {
 	    	}
     	}
     	
-    	TextView timeView = (TextView) layout.findViewById(R.id.time);
-    	timeView.setText(timestampToHumanDate(context, message.getTime()));
+    	TextView contact = (TextView) layout.findViewById(R.id.contact_header);
+    	contact.setText(timestampToHumanDate(context, message.getTime()) + " - " + LinphoneUtils.getUsernameFromAddress(message.getFrom().asStringUriOnly()));
     	
     	LinphoneChatMessage.State status = message.getStatus();
     	statusView = (ImageView) layout.findViewById(R.id.status);
@@ -289,7 +284,7 @@ public class BubbleChat {
 	public void loadBitmap(String path, ImageView imageView) {
 		if (cancelPotentialWork(path, imageView)) {
 			BitmapWorkerTask task = new BitmapWorkerTask(imageView);
-			Bitmap defaultBitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.chat_photo_default);
+			Bitmap defaultBitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.chat_picture_default);
 			final AsyncBitmap asyncBitmap = new AsyncBitmap(mContext.getResources(), defaultBitmap, task);
 			imageView.setImageDrawable(asyncBitmap);
 			task.execute(path);