diff --git a/res/layout/chat_bubble.xml b/res/layout/chat_bubble.xml
index ea91abc84..e11301559 100644
--- a/res/layout/chat_bubble.xml
+++ b/res/layout/chat_bubble.xml
@@ -108,25 +108,37 @@
 				</RelativeLayout>
 	
 			</LinearLayout>
+			
+		</LinearLayout>
 	
+		<RelativeLayout
+		    android:layout_alignRight="@id/background"
+		    android:layout_alignTop="@id/background"
+			android:layout_width="15dp"
+			android:layout_height="15dp"
+			android:paddingTop="5dp">
+			
 			<ImageView
 				android:id="@+id/status"
 				android:contentDescription="@string/content_description_message_status"
 				android:visibility="invisible"
-				android:padding="5dp"
-				android:layout_gravity="top|right"
-				android:layout_width="20dp"
-				android:layout_height="20dp"
+				android:layout_alignParentTop="true"
+				android:layout_alignParentRight="true"
+				android:paddingRight="5dp"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
 				android:adjustViewBounds="true" />
 	
 			<ProgressBar
 				android:id="@+id/inprogress"
 				android:visibility="gone"
+				android:layout_alignParentTop="true"
+				android:layout_alignParentRight="true"
 				android:paddingRight="5dp"
-				android:layout_gravity="top|right"
-				android:layout_width="20dp"
-				android:layout_height="20dp"/>
-		</LinearLayout>
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"/>
+		
+		</RelativeLayout>
 	
 	</RelativeLayout>