diff --git a/res/layout/message_recieved.xml b/res/layout/message_recieved.xml
index c11c00876..df4d429af 100644
--- a/res/layout/message_recieved.xml
+++ b/res/layout/message_recieved.xml
@@ -3,68 +3,71 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:padding="8dp">
+    android:padding="8dp" >
 
     <LinearLayout
+        android:id="@+id/linearLayout1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@drawable/message_border"
+        android:layout_alignParentBottom="true"
         android:layout_toRightOf="@+id/message_photo"
-     	android:layout_alignParentBottom="true"
-     	android:minHeight="48dp"
-     	>
-<LinearLayout
-    android:layout_width="wrap_content"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:background="#ededed"
-    android:padding="5dp">   
+        android:background="@drawable/message_border"
+        android:minHeight="48dp" >
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:autoLink="web"
-        android:textSize="16sp"
-        android:id="@+id/message_body"
-        android:textColor="#333333"/>
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingTop="1dp"
-        android:paddingRight="8dp"
-        android:text="@string/sending"
-        android:textColor="#8e8e8e"
-        android:textSize="12sp"
-        android:id="@+id/message_time"
-        android:layout_gravity="center_vertical"
-        android:gravity="center_vertical"/>
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:background="#ededed"
+            android:orientation="vertical"
+            android:padding="5dp" >
 
-    <ImageView
-        android:id="@+id/security_indicator"
-        android:layout_width="14sp"
-        android:layout_height="14sp"
-        android:layout_gravity="center_vertical"
-        android:gravity="center_vertical"
-        android:paddingTop="2dp"
-        android:src="@drawable/ic_indicator"
-        android:visibility="gone"/>
+            <TextView
+                android:id="@+id/message_body"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:autoLink="web"
+                android:textColor="#333333"
+                android:textSize="16sp" />
+
+           <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <ImageView
+                    android:id="@+id/security_indicator"
+                    android:layout_width="12sp"
+                    android:layout_height="12sp"
+                    android:layout_gravity="center_vertical"
+                    android:gravity="center_vertical"
+                    android:layout_marginTop="2sp"
+                    android:src="@drawable/ic_indicator"
+                    android:layout_marginRight="6sp"/>
+
+
+                <TextView
+                    android:id="@+id/message_time"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:gravity="center_vertical"
+                    android:paddingTop="1dp"
+                    android:text="@string/sending"
+                    android:textColor="#8e8e8e"
+                    android:textSize="12sp" />
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
 
-</LinearLayout>
-	</LinearLayout>
-</LinearLayout>
     <ImageView
         android:id="@+id/message_photo"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:layout_alignParentTop="true"
         android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
         android:layout_marginRight="-1.5dp"
         android:padding="0dp"
-        android:src="@drawable/ic_profile"
-        android:scaleType="fitXY"/>
-	
-</RelativeLayout>
+        android:scaleType="fitXY"
+        android:src="@drawable/ic_profile" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/message_sent.xml b/res/layout/message_sent.xml
index c966d0093..31843d2d1 100644
--- a/res/layout/message_sent.xml
+++ b/res/layout/message_sent.xml
@@ -31,7 +31,8 @@
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal" >
+                android:orientation="horizontal"
+                android:layout_gravity="right">
 
                 <TextView
                     android:id="@+id/message_time"
@@ -39,21 +40,21 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:gravity="center_vertical"
-                    android:paddingRight="8dp"
                     android:paddingTop="1dp"
                     android:text="@string/sending"
                     android:textColor="#8e8e8e"
                     android:textSize="12sp" />
-
-                <ImageView
+                
+                 <ImageView
                     android:id="@+id/security_indicator"
-                    android:layout_width="14sp"
-                    android:layout_height="14sp"
+                    android:layout_width="12sp"
+                    android:layout_height="12sp"
                     android:layout_gravity="center_vertical"
                     android:gravity="center_vertical"
-                    android:paddingTop="2dp"
+                    android:layout_marginTop="2sp"
                     android:src="@drawable/ic_indicator"
-                    android:visibility="gone"/>
+                    android:layout_marginLeft="6sp"/>
+
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>