diff --git a/src/SocialEntity/Status.php b/src/SocialEntity/Status.php
index 669ae85..b2bfb30 100644
--- a/src/SocialEntity/Status.php
+++ b/src/SocialEntity/Status.php
@@ -12,9 +12,9 @@ class Status
     private string $uri;
     private string $url;
     private MastodonAccount $account;
-    private string $in_reply_to_id;
-    private string $in_reply_to_account_id;
-    private string $content;
+    private ?string $in_reply_to_id;
+    private ?string $in_reply_to_account_id;
+    private ?string $content;
     private DateTime $created_at;
     private DateTime $scheduled_at;
     /** @var Emoji[] */
@@ -26,7 +26,7 @@ class Status
     private bool $favourited;
     private bool $muted;
     private bool $sensitive_;
-    private string $spoiler_text;
+    private ?string $spoiler_text;
     private string $visibility;
     /** @var Attachment[] */
     private array $media_attachments = [];
@@ -106,15 +106,15 @@ class Status
     }
 
     /**
-     * @return string
+     * @return string|null
      */
-    public function getInReplyToId(): string
+    public function getInReplyToId(): ?string
     {
         return $this->in_reply_to_id;
     }
 
     /**
-     * @param string $in_reply_to_id
+     * @param mixed $in_reply_to_id
      */
     public function setInReplyToId(?string $in_reply_to_id): void
     {
@@ -130,7 +130,7 @@ class Status
     }
 
     /**
-     * @param string $in_reply_to_account_id
+     * @param mixed $in_reply_to_account_id
      */
     public function setInReplyToAccountId(?string $in_reply_to_account_id): void
     {
@@ -138,17 +138,17 @@ class Status
     }
 
     /**
-     * @return string
+     * @return string|null
      */
-    public function getContent(): string
+    public function getContent(): ?string
     {
         return $this->content;
     }
 
     /**
-     * @param string $content
+     * @param mixed $content
      */
-    public function setContent(string $content): void
+    public function setContent(?string $content): void
     {
         $this->content = $content;
     }
@@ -162,7 +162,7 @@ class Status
     }
 
     /**
-     * @param DateTime $created_at
+     * @param mixed $created_at
      */
     public function setCreatedAt(?DateTime $created_at): void
     {
@@ -323,7 +323,7 @@ class Status
     }
 
     /**
-     * @param string $spoiler_text
+     * @param mixed $spoiler_text
      */
     public function setSpoilerText(?string $spoiler_text): void
     {
diff --git a/templates/fediplan/Ajax/layout.html.twig b/templates/fediplan/Ajax/layout.html.twig
index eddd89d..baa6542 100644
--- a/templates/fediplan/Ajax/layout.html.twig
+++ b/templates/fediplan/Ajax/layout.html.twig
@@ -14,10 +14,27 @@
                             {% if status.spoilerText is defined %}
                                 <b>{{ status.spoilerText  }}</b> <br/>
                             {% endif %}
-                            {{ status.content | nl2br }}
+                            {% if status.content is not null %}
+                                {{ status.content | nl2br }}
+                            {% endif %}
                         </p>
                     </div>
                 </div>
+                {% if status.getMediaAttachments() is not null and status.getMediaAttachments() | length > 0%}
+                <div class="card-horizontal" style=" display: flex;flex: 1 1 auto;">
+                    <div class="img-square-wrapper">
+                        {% for media in  status.getMediaAttachments() %}
+                            <img class="" width="150" src="{{ media.url  }}"
+                                 style=" border-radius: 5%; margin: 5px;"
+                                 {% if media.getDescription is not null %}
+                                     alt="{{ media.getDescription() }}"
+                                     title="{{ media.getDescription() }}"
+                                 {% endif %}
+                            />
+                        {% endfor %}
+                    </div>
+                </div>
+                {% endif %}
                 <div class="card-footer">
                     <small class="text-muted">
                         {% if status.visibility == "public" %}
@@ -32,7 +49,12 @@
                     </small> - {{ status.scheduledAt | date('d/m/y H:i')   }}
                     <button class="btn btn-danger small" data-record-id="{{ status.getId() }}"  style="position: absolute;right: 5px;bottom: 5px;"
 
-                            data-record-title="{{ status.content }} - {{ status.scheduledAt | date('d/m/y H:m')  }}"
+                            {% if status.content is not null %}
+                                data-record-title="{{ status.content }} - {{ status.scheduledAt | date('d/m/y H:m')  }}"
+                            {% else %}
+                                data-record-title="{{ status.scheduledAt | date('d/m/y H:m')  }}"
+                            {% endif %}
+
                             data-toggle="modal" data-target="#confirm-delete"
                     >X</button>
                 </div>