diff --git a/src/core/locale/en/LC_MESSAGES/django.po b/src/core/locale/en/LC_MESSAGES/django.po
index d415042cbe8c753fec3705d942da123539d03f66..204ae3184274a6c2afba4bb2ce7ba07230177541 100644
--- a/src/core/locale/en/LC_MESSAGES/django.po
+++ b/src/core/locale/en/LC_MESSAGES/django.po
@@ -18,6 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "messages_from_sender"
+msgstr "Message from"
+
+msgid "messages_was_sent"
+msgstr "sent"
+
 msgid "PlatformUser__favorite_event"
 msgstr "favorite event"
 
diff --git a/src/plainui/jinja2/plainui/personal_message_list.html b/src/plainui/jinja2/plainui/personal_message_list.html
index 575584d76652f4269110398241a53921d626a0d7..bb97eaf0324a5e923b2bc54355bd1a6f69a6bdcd 100644
--- a/src/plainui/jinja2/plainui/personal_message_list.html
+++ b/src/plainui/jinja2/plainui/personal_message_list.html
@@ -5,21 +5,25 @@
 {% block content %}
 {{ titleMacro.title(_("Personal Messages") ) }}
 
-<div class="border border-tertiary my-8 p-6 text-center">
+<div class="border my-8 p-6 text-center">
     <ul class="row mb-0 list-unstyled mw-664 mx-auto">
-        <li class="col-12 col-sm-4 mb-3 mb-sm-0">
-            <a role="button" class="btn btn-block btn-lg btn-secondary" href="{{ url('plainui:personal_message', conf_slug=conf.slug) }}">{{_("Inbox")}}</a>
-        </li>
-        <li class="col-12 col-sm-4 mb-3 mb-sm-0">
-            <a role="button" class="btn btn-block btn-lg btn-secondary" href="{{ url('plainui:personal_message_outbox', conf_slug=conf.slug) }}">{{_("Outbox")}}</a>
-        </li>
-        <li class="col-12 col-sm-4">
+        {% if sent_mode %}
+            <li class="col-12 col-sm-6 mb-3 mb-sm-0">
+                <a role="button" class="btn btn-block btn-lg btn-secondary" href="{{ url('plainui:personal_message', conf_slug=conf.slug) }}">{{_("Inbox")}}</a>
+            </li>
+        {% endif %}
+        {% if not sent_mode %}
+            <li class="col-12 col-sm-6 mb-3 mb-sm-0">
+                <a role="button" class="btn btn-block btn-lg btn-secondary" href="{{ url('plainui:personal_message_outbox', conf_slug=conf.slug) }}">{{_("Outbox")}}</a>
+            </li>
+        {% endif %}
+        <li class="col-12 col-sm-6">
             <a role="button" class="btn btn-block btn-lg btn-primary" href="{{ url('plainui:personal_message_send', conf_slug=conf.slug) }}">{{_("New PM")}}</a>
         </li>
     </ul>
 </div>
 
-<div class="border border-tertiary p-6 mx-0 mt-8 mb-11">
+<div class="border p-6 mx-0 mt-8 mb-11">
     <h2 class="text-center bg-info p-3 text-white h3">{% if not sent_mode %}{{ _("Received Messages") }} {% else %}{{ _("Sent Messages") }}{% endif %}</h2>
     <form method="POST" action="{{ url('plainui:personal_message_delete', conf_slug=conf.slug) }}">
         {{ csrf_input }}
@@ -50,6 +54,11 @@
                                             <path d="M.05 3.555A2 2 0 0 1 2 2h12a2 2 0 0 1 1.95 1.555L8 8.414.05 3.555zM0 4.697v7.104l5.803-3.558L0 4.697zM6.761 8.83l-6.57 4.027A2 2 0 0 0 2 14h12a2 2 0 0 0 1.808-1.144l-6.57-4.027L8 9.586l-1.239-.757zm3.436-.586L16 11.801V4.697l-5.803 3.546z"/>
                                         </svg>
                                     {% endif %}
+                                {% else %}
+                                    <svg class="rc3-tile-message__icon" xmlns="http://www.w3.org/2000/svg" width="3.125rem" height="3.125rem" fill="currentColor" class="bi bi-mailbox" viewBox="0 0 16 16">
+                                        <title>{{_("messages_was_sent")}}</title>
+                                        <path fill-rule="evenodd" d="M6 8a.5.5 0 0 0 .5.5h5.793l-2.147 2.146a.5.5 0 0 0 .708.708l3-3a.5.5 0 0 0 0-.708l-3-3a.5.5 0 0 0-.708.708L12.293 7.5H6.5A.5.5 0 0 0 6 8zm-2.5 7a.5.5 0 0 1-.5-.5v-13a.5.5 0 0 1 1 0v13a.5.5 0 0 1-.5.5z"/>
+                                    </svg>
                                 {% endif %}
                             </a>
                         </figure>
diff --git a/src/plainui/jinja2/plainui/personal_message_show.html b/src/plainui/jinja2/plainui/personal_message_show.html
index 1dc60213490d17b075348fe78ca884fb4a373345..cd7038280b3b481fa23d22e302c2f2da7ffa8e7d 100644
--- a/src/plainui/jinja2/plainui/personal_message_show.html
+++ b/src/plainui/jinja2/plainui/personal_message_show.html
@@ -4,33 +4,44 @@
 {% extends "plainui/base.html" %}
 {% block title %}{{conf.name}} - {{ _("Personal Message") }}{% endblock %}
 {% block content %}
-{{ titleMacro.title( msg.subject, report_url=msg.id, report_kind="pn") }}
 
-<div class="border p-6 text-light mx-0 my-11">
-    <h2 class="text-center bg-info p-3 text-white h3">
-        {{ _("messages_from_short") }} {{ msg.sender.username }} {{ _("messages_to_short") }} {{ msg.recipient.username }}
-        <time datetime="{{msg.timestamp}}" class="d-block font-sans-serif fs-medium">
+<article class="mb-11">
+    {% set title = _("messages_from_sender") + " " + msg.sender.username %}
+    {{ titleMacro.title( title , report_url=msg.id, report_kind="pn") }}
+
+    <div class="border my-8 p-6 text-center">
+        <ul class="row mb-0 list-unstyled mw-664 mx-auto">
+            <li class="col-12 col-sm-4 mb-3 mb-sm-0">
+                <a class="btn btn-xl btn-block btn-secondary" href="{{ url('plainui:personal_message', conf_slug=conf.slug) }}">
+                    {{_("Messages")}}
+                </a>
+            </li>
+
+            <li class="col-12 col-sm-4 mb-3 mb-sm-0">
+                <form method="POST" action="{{ url('plainui:personal_message_delete', conf_slug=conf.slug) }}">
+                    <button class="btn btn-xl btn-block btn-secondary" type="submit" name="id" value="{{msg.id}}" title="{{ _("messages_delete") }}">
+                        {{ _("Delete") }}
+                    </button>
+                </form>
+            </li>
+
+            {% if user.id == msg.recipient.id %}
+                <li class="col-12 col-sm-4">
+                    <a class="btn btn-xl btn-block btn-primary" href="{{ url('plainui:personal_message_send_to', conf_slug=conf.slug, recipient=msg.sender.username) ~ '?in_reply_to=' ~ msg.id | urlencode ~ '&subject=AW: ' ~ msg.subject | truncate(100) | urlencode }}">
+                        {{_("Reply")}}
+                    </a>
+                </li>
+            {% endif %}
+        </ul>
+    </div>
+
+    <h2 class="d-flex flex-row flex-wrap mt-11">
+        {{ msg.subject }}
+        <time datetime="{{msg.timestamp}}" class="d-block font-sans-serif fs-medium pl-2 ml-auto align-self-center">
             {{ msg.timestamp | strftime }}
         </time>
     </h2>
 
     {{ markdown(msg_body) }}
-
-    <ul class="row justify-content-end list-unstyled mt-5 mb-0">
-        <li class="col-12 col-md-3 mb-3 mb-lg-0">
-            <form method="POST" action="{{ url('plainui:personal_message_delete', conf_slug=conf.slug) }}">
-                <button class="ml-2 btn btn-xl btn-block btn-secondary" type="submit" name="id" value="{{msg.id}}" title="{{ _("messages_delete") }}">
-                    {{ _("Delete") }}
-                </button>
-            </form>
-        </li>
-        {% if user.id == msg.recipient.id %}
-            <li class="col-12 col-md-3">
-                <a class=" btn btn-xl btn-block btn-primary" href="{{ url('plainui:personal_message_send_to', conf_slug=conf.slug, recipient=msg.sender.username) ~ '?in_reply_to=' ~ msg.id | urlencode ~ '&subject=AW: ' ~ msg.subject | truncate(100) | urlencode }}">
-                    {{_("Reply")}}
-                </a>
-            </li>
-        {% endif %}
-    </ul>
-</div>
+</article>
 {% endblock %}
diff --git a/src/plainui/locale/de/LC_MESSAGES/django.po b/src/plainui/locale/de/LC_MESSAGES/django.po
index f72e339edee1ed84586a4ee8865512a7e577c51b..02bf1e0b2830f65038c93cd8a37c54c8aa0ba5ca 100644
--- a/src/plainui/locale/de/LC_MESSAGES/django.po
+++ b/src/plainui/locale/de/LC_MESSAGES/django.po
@@ -411,6 +411,9 @@ msgstr "Löschen"
 msgid "messages_was_read"
 msgstr "gelesen"
 
+msgid "messages_was_sent"
+msgstr "gesendet"
+
 msgid "messages_x_of_n"
 msgstr "von"
 
@@ -426,6 +429,9 @@ msgstr "Abschicken"
 msgid "Personal Message"
 msgstr "Persönliche Nachricht"
 
+msgid "messages_from_sender"
+msgstr "Nachricht von"
+
 msgid "messages_from_short"
 msgstr "Von"