diff --git a/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/ConversationMessageAdapter.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/ConversationMessageAdapter.java
index f3df621..55c1361 100644
--- a/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/ConversationMessageAdapter.java
+++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/ConversationMessageAdapter.java
@@ -122,9 +122,14 @@ public class ConversationMessageAdapter extends ArrayAdapter<ConversationMessage
                     .findViewById(R.id.fragment_conversation_message_item_left_account_image)
                     .setVisibility(View.GONE);
 
+            //Align text on the right
+            contentView.setTextAlignment(View.TEXT_ALIGNMENT_TEXT_END);
+
         }
         else {
 
+
+
             //Message appears on the right
             ((LinearLayout)convertView).setGravity(Gravity.START);
 
@@ -142,6 +147,8 @@ public class ConversationMessageAdapter extends ArrayAdapter<ConversationMessage
                     .findViewById(R.id.fragment_conversation_message_item_right_account_image)
                     .setVisibility(View.GONE);
 
+            //Align text on the left
+            contentView.setTextAlignment(View.TEXT_ALIGNMENT_TEXT_START);
         }
 
         /*
diff --git a/app/src/main/res/layout/fragment_conversation_message_item.xml b/app/src/main/res/layout/fragment_conversation_message_item.xml
index d1e380e..8bdef36 100644
--- a/app/src/main/res/layout/fragment_conversation_message_item.xml
+++ b/app/src/main/res/layout/fragment_conversation_message_item.xml
@@ -17,7 +17,7 @@
 
     <LinearLayout
         android:id="@+id/fragment_conversation_message_item_container"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:padding="5dp"
@@ -40,7 +40,7 @@
             android:layout_gravity="center"
             android:padding="5dp"
             android:textColor="@color/conversation_otheruser_messages_textColor"
-            tools:text="A message" />
+            tools:text="A message"/>
 
         <ImageView
             android:id="@+id/fragment_conversation_message_item_messageimage"