diff --git a/froide_govplan/templates/froide_govplan/plugins/updates.html b/froide_govplan/templates/froide_govplan/plugins/updates.html
index 4b52c8e..55b9409 100644
--- a/froide_govplan/templates/froide_govplan/plugins/updates.html
+++ b/froide_govplan/templates/froide_govplan/plugins/updates.html
@@ -20,12 +20,18 @@
       </div>
       <div class="small">
         <time datetime="{{ update.timestamp|date:'c' }}">{{ update.timestamp|date:"DATE_FORMAT" }}</time>
-        <span>{% if update.user %}von {{ update.user.get_full_name }}{% endif %}{% if update.organization %}, {{ update.organization.name }}{% endif %}</span>
+
+        {% if update.user or update.organization %}
+        <span>
+          von {{ update.user.get_full_name }}{% if update.user and update.organization %},{% endif %}
+          {{ update.organization.name }}
+        </span>
+        {% endif %}
       </div>
     </div>
   </a>
 
-  {% if update.content %}
+  {% if update.content or show_context %}
   <div class="p-3 p-md-4 tight-margin">
     {% if show_context %}
       <h4 class="h5">{{ update.title }}</h4>
@@ -33,7 +39,7 @@
 
     {% with update.content|markdown as content %}
       {% if show_context %}
-        {{ content|truncatewords_html:75 }}
+        {{ content|truncatewords_html:50 }}
       {% else %}
         {{ content }}
       {% endif %}