diff --git a/www/pages/ajax.php b/www/pages/ajax.php
index e17fd730..b5276378 100644
--- a/www/pages/ajax.php
+++ b/www/pages/ajax.php
@@ -1289,7 +1289,7 @@ class Ajax {
         }
       break;
       case 'warteschlangename':
-        $arr = $this->app->DB->SelectArr("SELECT CONCAT(label, ' ', warteschlange) as result from warteschlangen");
+        $arr = $this->app->DB->SelectArr("SELECT CONCAT(label, ' ', warteschlange) as result from warteschlangen WHERE label LIKE '%$term%' OR warteschlange LIKE '%$term%' ORDER BY label");
         $carr = !empty($arr)?count($arr):0;
         for($i = 0; $i < $carr; $i++) {
           $newarr[] = "{$arr[$i]['result']}";
diff --git a/www/pages/content/ticket_edit.tpl b/www/pages/content/ticket_edit.tpl
index 67118ba5..a6d057ce 100644
--- a/www/pages/content/ticket_edit.tpl
+++ b/www/pages/content/ticket_edit.tpl
@@ -21,7 +21,7 @@
                                     <legend>{|[STATUSICON]<b>Ticket <font color="blue">#[SCHLUESSEL]</font></b>|}</legend>
                                     <tr><td>{|Betreff|}:</td><td><input type="text" name="betreff" id="betreff" value="[BETREFF]" size="20"></td></tr>
                                     <tr><td>{|Letzte Aktion|}:</td><td>[ZEIT]</td></tr>
-                                    <tr><td>{|Von|}:</td><td>[MAILADRESSE] ([KUNDE])</td></tr>
+                                    <tr><td>{|Von|}:</td><td>[KUNDE]&nbsp;[MAILADRESSE]</td></tr>
                                     <tr><td>{|Projekt|}:</td><td><input type="text" name="projekt" id="projekt" value="[PROJEKT]" size="20"></td></tr>
                                     <tr><td>{|Adresse|}:</td><td><input type="text" name="adresse" id="adresse" value="[ADRESSE]" size="20"><a href="index.php?module=adresse&action=edit&id=[ADRESSE_ID]"><img src="./themes/new/images/forward.svg" border="0" style="top:6px; position:relative"></a></td></tr>
                                     <tr><td>{|Tags|}:</td><td><input type="text" name="tags" id="tags" value="[TAGS]" size="20"></td></tr>
diff --git a/www/pages/content/ticket_nachricht.tpl b/www/pages/content/ticket_nachricht.tpl
index 8c28306a..8452ac29 100644
--- a/www/pages/content/ticket_nachricht.tpl
+++ b/www/pages/content/ticket_nachricht.tpl
@@ -8,6 +8,7 @@
 	                        			<div class="inside inside-full-height" >
 	                        				<fieldset>                                    
                                                 <table width="100%" border="0" class="mkTableFormular">
+                                                    <tr><td>{|Betreff|}:</td><td><b>[NACHRICHT_BETREFF]<b></td></tr>
                                                     <tr><td>{|Zeit|}:</td><td>[NACHRICHT_ZEIT]</td></tr>
                                                     <tr><td>{|Von|}:</td><td>[NACHRICHT_SENDER]</td></tr>
                                                     <tr><td>{|An|}:</td><td>[NACHRICHT_RECIPIENTS]</td></tr>
@@ -20,9 +21,7 @@
                                     <div class="col-xs-12 col-md-8 col-md-height ticket_nachricht_box" style="float:[NACHRICHT_FLOAT]">
 	                        			<div class="inside inside-full-height">
 	                        				<fieldset>
-                                                <legend>{|<b>[NACHRICHT_BETREFF]</b>|}</legend>
                                                 <table width="100%" border="0" class="mkTableFormular">
-                                                    <tr><td colspan=2><hr style="border-style:solid; border-width:1px"></td></tr>
                                                     <tr><td colspan=2><div id="body" class="ticket_text_div">[NACHRICHT_TEXT]</div></td></tr>
                                                 </table>
                                             </fieldset> 
diff --git a/www/pages/ticket.php b/www/pages/ticket.php
index a9ed6542..5dc371b5 100644
--- a/www/pages/ticket.php
+++ b/www/pages/ticket.php
@@ -328,7 +328,7 @@ class Ticket {
                     }
                     $this->app->Tpl->Set("NACHRICHT_BETREFF",htmlentities($message['betreff']." (Entwurf)"));
                 } else {
-                  $this->app->Tpl->Set("NACHRICHT_BETREFF",htmlentities($message['betreff']));
+                  $this->app->Tpl->Set("NACHRICHT_BETREFF",'<a href="index.php?module=ticket&action=text&mid='.$message['id'].'" target="_blank">'.htmlentities($message['betreff']).'</a>');
                 }
                 $this->app->Tpl->Set("NACHRICHT_SENDER",htmlentities($message['verfasser']." <".$message['mail_replyto'].">"));
                 $this->app->Tpl->Set("NACHRICHT_RECIPIENTS",htmlentities($message['mail']));
@@ -564,6 +564,10 @@ class Ticket {
         $this->app->Tpl->Set('ADRESSE', $this->app->erp->ReplaceAdresse(false,$ticket_from_db['adresse'],false)); // Convert ID to form display
 
 
+        if ($ticket_from_db['mailadresse'] != "") {
+            $this->app->Tpl->Set('MAILADRESSE',"&lt;".$ticket_from_db['mailadresse']."&gt;");
+        }
+
         $this->app->Tpl->Set('ADRESSE_ID',$ticket_from_db['adresse']);
 
         $this->app->YUI->AutoComplete("projekt","projektname",1);
diff --git a/www/themes/new/css/styles.css b/www/themes/new/css/styles.css
index 4a59c714..98b759ed 100644
--- a/www/themes/new/css/styles.css
+++ b/www/themes/new/css/styles.css
@@ -1809,12 +1809,12 @@ fieldset.usersave div.filter-item > label {
 fieldset {
     position: relative;
     margin: 0;
-    margin-top: 5px;
+/*    margin-top: 5px;
     padding: 5px;
     border: 0 solid transparent;
     border-top: 25px solid transparent;
     border-bottom: 5px solid transparent;
-    border-width: 24px 5px 0;
+    border-width: 24px 5px 0;*/
     border-color: transparent;
     background-color: transparent;
 }
@@ -2469,12 +2469,19 @@ ul.tag-editor {
 
 .ticket_nachricht_box {
     border: solid 1px;
+    border-color: var(--textfield-border);
     border-radius: 7px;
+    padding: 0px !important;
+}
+
+.ticket_nachricht_box fieldset {
+    padding: 0px !important;
 }
 
 .ticket_text {
     width: 100%;
     border: none;
+    height: 300px;
 }
 
 .ui-button-icon,