diff --git a/app/src/main/res/layout/item_custom_outcoming_deck_card_message.xml b/app/src/main/res/layout/item_custom_outcoming_deck_card_message.xml
index 1f79523ad..679e751f4 100644
--- a/app/src/main/res/layout/item_custom_outcoming_deck_card_message.xml
+++ b/app/src/main/res/layout/item_custom_outcoming_deck_card_message.xml
@@ -41,22 +41,23 @@
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
                 android:orientation="horizontal">
 
                 <ImageView
                     android:id="@+id/deckCardImage"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:contentDescription="@null"
                     android:src="@drawable/baseline_assignment_24" />
 
                 <androidx.emoji2.widget.EmojiTextView
                     android:id="@+id/cardName"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
+                    android:layout_marginStart="4dp"
                     android:ellipsize="end"
-                    android:lineSpacingMultiplier="1.2"
-                    app:layout_flexGrow="1"
+                    android:maxLines="1"
                     android:textIsSelectable="false"
                     android:textStyle="bold"
                     android:visibility="gone"
@@ -69,35 +70,39 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
-                android:lineSpacingMultiplier="1.2"
-                app:layout_flexGrow="1"
+                android:maxLines="1"
                 android:textAlignment="viewStart"
                 android:textIsSelectable="false"
                 android:visibility="gone"
                 tools:text="Card Description"
                 tools:visibility="visible" />
 
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginTop="4dp"
+            android:layout_gravity="end"
+            tools:ignore="UseCompoundDrawables">
+
             <TextView
                 android:id="@id/messageTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="end"
                 android:alpha="0.6"
                 android:textColor="@color/no_emphasis_text"
                 android:textIsSelectable="false"
                 tools:text="12:38" />
-
+            <ImageView
+                android:id="@+id/checkMark"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/message_bubble_checkmark_height"
+                android:layout_marginStart="4dp"
+                android:contentDescription="@null"
+                app:tint="@color/high_emphasis_text" />
         </LinearLayout>
 
-        <ImageView
-            android:id="@+id/checkMark"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/message_bubble_checkmark_height"
-            android:layout_below="@id/messageTime"
-            android:layout_marginStart="8dp"
-            android:contentDescription="@null"
-            app:layout_alignSelf="center"
-            app:tint="@color/high_emphasis_text" />
+        </LinearLayout>
 
         <include
             android:id="@+id/reactions"