diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/SingleChatAdapter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/SingleChatAdapter.java
index 1877c38..5960951 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/SingleChatAdapter.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/SingleChatAdapter.java
@@ -34,9 +34,9 @@ class SingleChatAdapter extends BaseChatAdapter {
             View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_chat_date, parent, false);
             return new DateViewHolder(view);
         }
+
         ProgressBar progressBar = new ProgressBar(parent.getContext());
-        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
-                FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
+        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
         params.gravity = Gravity.CENTER;
         params.setMargins(0, (int) parent.getContext().getResources().getDimension(R.dimen.messages_progress_top_margin), 0, 0);
         progressBar.setLayoutParams(params);
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_left.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_left.xml
index 5e5b8c0..33c71d3 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_left.xml
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_left.xml
@@ -3,59 +3,65 @@
                 xmlns:custom="http://schemas.android.com/apk/res-auto"
                 xmlns:tools="http://schemas.android.com/tools"
                 xmlns:emojicon="http://schemas.android.com/apk/res-auto"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/LeftChatItemRelativeLayout"
+                android:paddingRight="40dp"
                 android:layout_marginTop="6dp"
                 android:layout_marginBottom="6dp"
                 android:paddingTop="13dp">
 
-    <TextView
-        android:id="@+id/chat_item_time"
+    <RelativeLayout
+        android:id="@+id/singleChatLeftContainer"
+        style="@style/LeftChatItemRelativeLayout"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="@color/colorManatee"
-        android:textSize="10sp"
-        tools:ignore="SmallSp"
-        tools:text="15:23" />
+        android:layout_height="wrap_content">
+        <TextView
+            android:id="@+id/chat_item_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/colorManatee"
+            android:textSize="10sp"
+            tools:ignore="SmallSp"
+            tools:text="15:23" />
 
-    <ImageView
-        android:id="@+id/chat_item_file"
-        android:layout_width="wrap_content"
-        android:layout_height="90dp"
-        android:layout_below="@id/chat_item_time"
-        android:layout_marginTop="4dp"
-        android:adjustViewBounds="true"
-        android:contentDescription="@null"
-        android:scaleType="fitStart"
-        android:visibility="gone" />
+        <ImageView
+            android:id="@+id/chat_item_file"
+            android:layout_width="wrap_content"
+            android:layout_height="90dp"
+            android:layout_below="@id/chat_item_time"
+            android:layout_marginTop="4dp"
+            android:adjustViewBounds="true"
+            android:contentDescription="@null"
+            android:scaleType="fitStart"
+            android:visibility="gone" />
 
-    <TextView
-        android:id="@+id/chat_item_file_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="95dp"
-        android:visibility="gone"
-        android:layout_below="@+id/chat_item_time"
-        android:textColor="@color/colorBlack" />
+        <TextView
+            android:id="@+id/chat_item_file_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="95dp"
+            android:visibility="gone"
+            android:layout_below="@+id/chat_item_time"
+            android:textColor="@color/colorBlack" />
 
-    <com.github.lzyzsd.circleprogress.DonutProgress
-        android:id="@+id/chat_item_progress"
-        android:layout_width="90dp"
-        android:layout_height="90dp"
-        android:layout_below="@id/chat_item_time"
-        android:layout_marginTop="4dp"
-        android:visibility="gone"
-        custom:donut_finished_color="@color/colorDefault"
-        custom:donut_text_color="@color/colorBlack" />
+        <com.github.lzyzsd.circleprogress.DonutProgress
+            android:id="@+id/chat_item_progress"
+            android:layout_width="90dp"
+            android:layout_height="90dp"
+            android:layout_below="@id/chat_item_time"
+            android:layout_marginTop="4dp"
+            android:visibility="gone"
+            custom:donut_finished_color="@color/colorDefault"
+            custom:donut_text_color="@color/colorBlack" />
 
-    <hani.momanii.supernova_emoji_library.Helper.EmojiconTextView
-        android:id="@+id/chat_item_message"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        emojicon:emojiconSize="20sp"
-        android:textColor="@color/colorBlack"
-        android:layout_below="@id/chat_item_file"
-        tools:text="Hi Daniel! What advice could you give me on speed cooking? I’m thinking of opening a small bistro" />
+        <hani.momanii.supernova_emoji_library.Helper.EmojiconTextView
+            android:id="@+id/chat_item_message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            emojicon:emojiconSize="20sp"
+            android:textColor="@color/colorBlack"
+            android:layout_below="@id/chat_item_file"
+            tools:text="Hi Daniel! What advice could you give me on speed cooking? I'm thinking of opening a small bistro" />
+    </RelativeLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_right.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_right.xml
index e4c2320..2227136 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_right.xml
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_right.xml
@@ -3,115 +3,127 @@
                 xmlns:custom="http://schemas.android.com/apk/res-auto"
                 xmlns:tools="http://schemas.android.com/tools"
                 xmlns:emojicon="http://schemas.android.com/apk/res-auto"
-                android:layout_width="wrap_content"
+                android:layoutDirection="rtl"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/RightChatItemRelativeLayout"
                 android:layout_marginTop="6dp"
                 android:layout_marginBottom="6dp"
+                android:paddingLeft="40dp"
+                android:paddingEnd="40dp"
+                android:paddingRight="0dp"
+                android:paddingStart="0dp"
                 android:paddingTop="13dp">
 
-    <TextView
-        android:id="@+id/chat_item_sending_failed"
+    <RelativeLayout
+        android:id="@+id/singleChatRightContainer"
+        style="@style/RightChatItemRelativeLayout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toLeftOf="@+id/chat_item_message_status"
-        android:layout_toStartOf="@+id/chat_item_message_status"
-        android:paddingBottom="5dp"
-        android:paddingLeft="5dp"
-        android:paddingRight="5dp"
-        android:text="@string/chat_item_sending_failed"
-        android:textColor="@color/colorHarvard"
-        android:textSize="10sp"
-        android:visibility="gone"
-        tools:ignore="SmallSp"
-        tools:visibility="visible" />
+        android:padding="2dp"
+        >
+        <TextView
+            android:id="@+id/chat_item_sending_failed"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toLeftOf="@+id/chat_item_message_status"
+            android:layout_toStartOf="@+id/chat_item_message_status"
+            android:paddingBottom="5dp"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:text="@string/chat_item_sending_failed"
+            android:textColor="@color/colorHarvard"
+            android:textSize="10sp"
+            android:visibility="gone"
+            tools:ignore="SmallSp"
+            tools:visibility="visible" />
 
-    <ProgressBar
-        android:id="@+id/chat_item_message_status_progress_bar"
-        android:layout_width="15dp"
-        android:layout_height="15dp"
-        android:layout_alignBottom="@+id/chat_item_time"
-        android:layout_alignTop="@+id/chat_item_time"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_toLeftOf="@+id/chat_item_time"
-        android:layout_toStartOf="@+id/chat_item_time"
-        android:visibility="gone" />
+        <ProgressBar
+            android:id="@+id/chat_item_message_status_progress_bar"
+            android:layout_width="15dp"
+            android:layout_height="15dp"
+            android:layout_alignBottom="@+id/chat_item_time"
+            android:layout_alignTop="@+id/chat_item_time"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_toLeftOf="@+id/chat_item_time"
+            android:layout_toStartOf="@+id/chat_item_time"
+            android:visibility="gone" />
 
-    <ImageView
-        android:id="@+id/chat_item_message_status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/chat_item_time"
-        android:layout_alignTop="@+id/chat_item_time"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_toLeftOf="@+id/chat_item_time"
-        android:layout_toStartOf="@+id/chat_item_time"
-        android:contentDescription="@null"
-        android:visibility="gone"
-        tools:src="@drawable/delivered" />
+        <ImageView
+            android:id="@+id/chat_item_message_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@+id/chat_item_time"
+            android:layout_alignTop="@+id/chat_item_time"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_toLeftOf="@+id/chat_item_time"
+            android:layout_toStartOf="@+id/chat_item_time"
+            android:contentDescription="@null"
+            android:visibility="gone"
+            tools:src="@drawable/delivered" />
 
-    <TextView
-        android:id="@+id/chat_item_time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:textColor="@color/colorManatee"
-        android:textSize="10sp"
-        tools:ignore="SmallSp"
-        tools:text="15:23" />
+        <TextView
+            android:id="@+id/chat_item_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentLeft="true"
+            android:textColor="@color/colorManatee"
+            android:textSize="10sp"
+            tools:ignore="SmallSp"
+            tools:text="15:23" />
 
-    <ImageView
-        android:id="@+id/chat_item_file"
-        android:layout_width="wrap_content"
-        android:layout_height="90dp"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_below="@id/chat_item_time"
-        android:layout_marginTop="4dp"
-        android:adjustViewBounds="true"
-        android:contentDescription="@null"
-        android:scaleType="fitEnd"
-        android:src="@drawable/splash_one_size_fits_all"
-        android:visibility="gone"/>
+        <ImageView
+            android:id="@+id/chat_item_file"
+            android:layout_width="wrap_content"
+            android:layout_height="90dp"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentLeft="true"
+            android:layout_below="@id/chat_item_time"
+            android:layout_marginTop="4dp"
+            android:adjustViewBounds="true"
+            android:contentDescription="@null"
+            android:scaleType="fitEnd"
+            android:src="@drawable/splash_one_size_fits_all"
+            android:visibility="gone"/>
 
-    <com.github.lzyzsd.circleprogress.DonutProgress
-        android:id="@+id/chat_item_progress"
-        android:layout_width="90dp"
-        android:layout_height="90dp"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_below="@id/chat_item_time"
-        android:layout_marginTop="4dp"
-        android:visibility="gone"
-        custom:donut_finished_color="@color/colorDefault"
-        custom:donut_text_color="@color/colorBlack" />
+        <com.github.lzyzsd.circleprogress.DonutProgress
+            android:id="@+id/chat_item_progress"
+            android:layout_width="90dp"
+            android:layout_height="90dp"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_below="@id/chat_item_time"
+            android:layout_marginTop="4dp"
+            android:visibility="gone"
+            custom:donut_finished_color="@color/colorDefault"
+            custom:donut_text_color="@color/colorBlack" />
 
-    <TextView
-        android:id="@+id/chat_item_file_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_below="@+id/chat_item_time"
-        android:layout_marginTop="95dp"
-        android:textColor="@color/colorBlack"
-        android:visibility="gone" />
+        <TextView
+            android:id="@+id/chat_item_file_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_below="@+id/chat_item_time"
+            android:layout_marginTop="95dp"
+            android:textColor="@color/colorBlack"
+            android:visibility="gone" />
 
-    <!-- style="@style/RightChatItemText" -->
-    <hani.momanii.supernova_emoji_library.Helper.EmojiconTextView
-        android:id="@+id/chat_item_message"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_below="@id/chat_item_file"
-        android:visibility="gone"
-        emojicon:emojiconSize="20sp"
-        tools:text="Hi Daniel! What advice could you give me on speed cooking? I’m thinking of opening a small bistro"
-        android:textColor="@color/colorWhite"
-        />
+        <hani.momanii.supernova_emoji_library.Helper.EmojiconTextView
+            android:id="@+id/chat_item_message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentLeft="true"
+            android:layout_below="@id/chat_item_file"
+            android:visibility="gone"
+            emojicon:emojiconSize="20sp"
+            tools:text="Hi Daniel! What advice could you give me on speed cooking? I'm thinking of opening a small bistro"
+            android:textColor="@color/colorWhite"
+            tools:visibility="visible"
+            />
+    </RelativeLayout>
 
 </RelativeLayout>
\ No newline at end of file