diff --git a/src/cheogram/res/layout/command_result_cell.xml b/src/cheogram/res/layout/command_result_cell.xml
index 8e818d1cd9f13d96a959fe394b695f981eae23bb..e15136a280539ac279488eb22c32446508d2acea 100644
--- a/src/cheogram/res/layout/command_result_cell.xml
+++ b/src/cheogram/res/layout/command_result_cell.xml
@@ -7,6 +7,9 @@
         android:textIsSelectable="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
+        android:paddingBottom="8dp"
         android:textAppearance="@style/TextAppearance.Conversations.Body1"
         android:textColor="?attr/edit_text_color" />
 
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index fb7ad358c130762880f8f2e7922c7f1b331bb55c..050252fddc4fcc95c73aafde37eb81c5f5179ac8 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -2271,7 +2271,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
                         }
 
                         if (el.getName().equals("reported") || el.getName().equals("item")) {
-                            if ((layoutManager == null ? 1 : layoutManager.getSpanCount()) < 2) {
+                            if ((layoutManager == null ? 1 : layoutManager.getSpanCount()) < reported.size()) {
                                 if (el.getName().equals("reported")) continue;
                                 i += 1;
                             } else {
@@ -2308,7 +2308,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
                                 Cell cell = null;
 
                                 if (reported != null) {
-                                    if ((layoutManager == null ? 1 : layoutManager.getSpanCount()) < 2) {
+                                    if ((layoutManager == null ? 1 : layoutManager.getSpanCount()) < reported.size()) {
                                         if (el.getName().equals("reported")) continue;
                                         if (i == position) {
                                             items.put(position, new Item(el, TYPE_ITEM_CARD));
@@ -2524,7 +2524,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
                         (a, b) -> a + b
                     );
 
-                    spanCount = tableHeaderWidth > 0.75 * screenWidth ? 1 : this.reported.size();
+                    spanCount = tableHeaderWidth > 0.65 * screenWidth ? 1 : this.reported.size();
                 }
 
                 if (layoutManager != null && layoutManager.getSpanCount() != spanCount) {