diff --git a/res/layout/chat.xml b/res/layout/chat.xml
index b67af95ed..bda6dca2d 100644
--- a/res/layout/chat.xml
+++ b/res/layout/chat.xml
@@ -174,7 +174,6 @@
 		android:layout_above="@id/footer"/>
 
 	<android.support.v7.widget.RecyclerView
-
 		android:id="@+id/chat_message_list"
 		android:divider="@android:color/transparent"
 		android:choiceMode="multipleChoice"
@@ -188,4 +187,13 @@
 		android:layout_marginLeft="10dp"
 		android:layout_below="@+id/top"/>
 
+	<ImageView
+		android:id="@+id/room_security_level"
+		android:layout_width="33dp"
+		android:layout_height="wrap_content"
+		android:src="@drawable/security_alert_button"
+		android:layout_alignParentRight="true"
+		android:layout_below="@id/top"
+		android:layout_marginRight="6dp"/>
+
 </RelativeLayout>
diff --git a/res/layout/chat_bubble.xml b/res/layout/chat_bubble.xml
index 1c750b0b3..2269a4556 100644
--- a/res/layout/chat_bubble.xml
+++ b/res/layout/chat_bubble.xml
@@ -92,7 +92,6 @@
 				android:layout_height="wrap_content"
 				android:orientation="vertical"
 				android:paddingTop="10dp"
-				android:paddingLeft="10dp"
 				android:paddingRight="10dp">
 
 				<TextView