diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
index 2da84234d..fc6fd749a 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
@@ -557,6 +557,9 @@ class ConversationsListActivity :
     }
 
     private fun futureEvent(conversation: ConversationModel): Boolean {
+        if(!conversation.objectId.contains("#")){
+            return false
+        }
         return conversation.objectType == ConversationEnums.ObjectType.EVENT &&
             (conversation.objectId.split("#")[0].toLong() - (System.currentTimeMillis() / 1000)) >
             AGE_THRESHOLD_FOR_EVENT_CONVERSATIONS
diff --git a/app/src/main/res/layout/item_event_schedule.xml b/app/src/main/res/layout/item_event_schedule.xml
index e97b7ba6e..4c8b7cab5 100644
--- a/app/src/main/res/layout/item_event_schedule.xml
+++ b/app/src/main/res/layout/item_event_schedule.xml
@@ -10,7 +10,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:padding="32dp"
+    android:padding="8dp"
     android:background="@color/bg_bottom_sheet">
 
     <TextView