diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 04fdcc57fc..a193eefbc6 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1987,16 +1987,23 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         }
                     }
 
+                    if (summary != null)
+                        summary = summary.trim();
+                    if (description != null)
+                        description = description.trim();
+                    if (location != null)
+                        location = location.trim();
+
                     Organizer organizer = event.getOrganizer();
 
                     tvCalendarSummary.setText(summary);
-                    tvCalendarSummary.setVisibility(summary == null ? View.GONE : View.VISIBLE);
+                    tvCalendarSummary.setVisibility(TextUtils.isEmpty(summary) ? View.GONE : View.VISIBLE);
 
                     tvCalendarDescription.setText(description);
-                    tvCalendarDescription.setVisibility(description == null ? View.GONE : View.VISIBLE);
+                    tvCalendarDescription.setVisibility(TextUtils.isEmpty(description) ? View.GONE : View.VISIBLE);
 
                     tvCalendarLocation.setText(location);
-                    tvCalendarLocation.setVisibility(location == null ? View.GONE : View.VISIBLE);
+                    tvCalendarLocation.setVisibility(TextUtils.isEmpty(location) ? View.GONE : View.VISIBLE);
 
                     tvCalendarStart.setText(start == null ? null : DTF.format(start.getTime()));
                     tvCalendarStart.setVisibility(start == null ? View.GONE : View.VISIBLE);