diff --git a/app/views/messages/write.php b/app/views/messages/write.php
index bf841a23e0b67048b5abf63bcd92676d0a7841d9..bddde8291278ff79a013ad289dbab176340402f2 100644
--- a/app/views/messages/write.php
+++ b/app/views/messages/write.php
@@ -6,7 +6,7 @@
 
     <fieldset>
         <legend><?= _('Neue Nachricht') ?></legend>
-    <div>
+    <div class="message-user-list">
         <label for="user_id_1"><?= _("An") ?></label>
         <ul class="list-csv" id="adressees">
             <li id="template_adressee" style="display: none;" class="adressee">
@@ -53,13 +53,13 @@
     <div>
         <label>
             <?= _("Betreff") ?>
-            <input type="text" name="message_subject" style="width: 100%" required value="<?= htmlReady($default_message['subject']) ?>">
+            <input type="text" name="message_subject" required value="<?= htmlReady($default_message['subject']) ?>">
         </label>
     </div>
     <div>
         <label>
             <?= _("Nachricht") ?>
-            <textarea style="width: 100%; height: 200px;" name="message_body" class="add_toolbar wysiwyg"><?= wysiwygReady($default_message['message'],false) ?></textarea>
+            <textarea name="message_body" class="add_toolbar wysiwyg"><?= wysiwygReady($default_message['message'],false) ?></textarea>
         </label>
     </div>
     <div>
diff --git a/resources/assets/stylesheets/scss/messages.scss b/resources/assets/stylesheets/scss/messages.scss
index f8d7660f0d71cf1cce5e2ea83301888b019e68da..63a78f96250b2f94d3f447d1572ff1f7d87217bb 100644
--- a/resources/assets/stylesheets/scss/messages.scss
+++ b/resources/assets/stylesheets/scss/messages.scss
@@ -87,10 +87,21 @@ a.message-tag {
     color: $base-gray;
 }
 
+form.default {
+    .message-user-list {
+        label {
+            margin: 0;
+        }
+
+        margin-bottom: $gap;
+    }
+}
+
 .message-search-wrapper {
     display: flex;
     justify-content: flex-start;
     margin-top: 1ex;
+    margin-bottom: 0.5ex;
 
     > * {
         margin-right: 1em;
diff --git a/resources/assets/stylesheets/studip-cke-ui.css b/resources/assets/stylesheets/studip-cke-ui.css
index 07e0d028e9c2fb2f70910f295fb87599e2296517..16f049678aef7aca319f314b5eb83632ce518660 100644
--- a/resources/assets/stylesheets/studip-cke-ui.css
+++ b/resources/assets/stylesheets/studip-cke-ui.css
@@ -63,6 +63,10 @@
     --ck-color-tooltip-background: var(--dark-gray-color-5);
 
 }
+
+.ck.ck-editor {
+    margin-top: 0.5ex;
+}
 .ck.ck-icon, .ck.ck-icon * {
     color: var(--base-color);
 }
diff --git a/templates/quicksearch/inputfield.php b/templates/quicksearch/inputfield.php
index fb9b63238e2c1116a80391170a705fc7a8ac8ab6..4dd569f9e353aab49f85c614665389f0cead8a98 100644
--- a/templates/quicksearch/inputfield.php
+++ b/templates/quicksearch/inputfield.php
@@ -4,7 +4,7 @@
 <? if ($withButton): ?>
 <div class="quicksearch_frame <?= ($extendedLayout === true) ? 'extendedLayout' : ''; ?>" id="<?= $id ?>_frame">
     <? if ($box_align === 'left'): ?>
-        <?= Icon::create('search', 'clickable')->asInput(["class" => 'text-bottom']) ?>
+        <?= Icon::create('search')->asInput(['class' => 'text-bottom']) ?>
     <? endif; ?>
 <? endif ?>
     <input type=hidden id="<?= $id ?>_realvalue" name="<?= $name ?>" value="<?= htmlReady($defaultID) ?>">
@@ -19,7 +19,7 @@
            placeholder="<?= $beschriftung && !$defaultID ? htmlReady($beschriftung) : '' ?>">
 <? if ($withButton): ?>
     <? if ($box_align !== 'left'): ?>
-        <input type="submit" value="Suche starten" name="<?= $search_button_name; ?>"></input>
+        <input type="submit" value="<?= _('Suche starten') ?>" name="<?= htmlReady($search_button_name) ?>">
     <? endif; ?>
 </div>
 <? endif ?>
@@ -28,7 +28,7 @@
     jQuery(function () {
         STUDIP.QuickSearch.autocomplete("<?= $id ?>",
             "<?= URLHelper::getURL("dispatch.php/quicksearch/response/".$query_id) ?>",
-            <?= $jsfunction ? $jsfunction : "null" ?>,
+            <?= $jsfunction ?: 'null' ?>,
             <?= $autocomplete_disabled ? "true" : "false" ?>
             );
     });