diff --git a/res/layout/chat_bubble_incoming.xml b/res/layout/chat_bubble_incoming.xml
index 0af3791b3..0050fd63d 100644
--- a/res/layout/chat_bubble_incoming.xml
+++ b/res/layout/chat_bubble_incoming.xml
@@ -3,11 +3,12 @@
     android:id="@+id/bubble"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:gravity="right"
+   	android:gravity="right"
     android:orientation="vertical" >
     
     <TextView 
         android:id="@+id/message"
+    	android:layout_gravity="left"
         android:textColor="@android:color/black"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
diff --git a/res/layout/chat_bubble_outgoing.xml b/res/layout/chat_bubble_outgoing.xml
index 4c9bd9a5d..9791e5010 100644
--- a/res/layout/chat_bubble_outgoing.xml
+++ b/res/layout/chat_bubble_outgoing.xml
@@ -8,6 +8,7 @@
     
     <TextView 
         android:id="@+id/message"
+    	android:layout_gravity="right"
         android:textColor="@android:color/black"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index fc9efc42e..70799ec88 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -15,7 +15,7 @@
 	<bool name="emoticons_in_messages">true</bool>
 	<bool name="only_display_username_if_unknown">true</bool>
 	<bool name="display_messages_time">true</bool> <!-- Used to show the time of each message arrival -->
-	<bool name="display_time_aside">true</bool> <!-- if display_messages_time = true, display time on the side of the message instead of below -->
+	<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="allow_ringing_while_early_media">true</bool>
 	<bool name="allow_transfers">true</bool>