diff --git a/APPL/Shared/queuemail.asp b/APPL/Shared/queuemail.asp
index 199839bf7a..27e62dfe23 100644
--- a/APPL/Shared/queuemail.asp
+++ b/APPL/Shared/queuemail.asp
@@ -276,8 +276,13 @@ else
         function onChangePerson()
         {
           // Vul email van persoon in
-          var current_val = ($("#emails").val() != "" ? $("#emails").val() + ";\n" : "");
-          $("#emails").val(current_val + $("#emailpersoon").val());
+          if ($("#emailpersoon").val())
+          {
+            var current_val = ($("#emails").val() != "" ? $("#emails").val() + "; " : "");
+            $("#emails").val(current_val + $("#emailpersoon").val());
+            $("#sName_key_show").val("");
+            $("textarea").autogrow();
+          }
 
 <%        if (pshowcompany)
           { %>
@@ -296,11 +301,7 @@ else
           if (!new RegExp("<%=safe.jsstring(S("email_regexp"))%>", "ig").test($("#emails").val()))
             alert(L("lcl_invalid_email"))
           else
-          { // verwijder eerst evetuele linefeeds voor submit.
-            var maillist = $("#emails").val().replace(/\r?\n|\r/g, "");
-            $("#emails").val(maillist);
             document.getElementById("u2").submit();
-          }
         }
 
         function queueCancel()
@@ -356,6 +357,7 @@ url = "queuemail.asp?submit=1&pcode="+pcode+"&key="+pkey+"&xkey="+xkey+"&submitt
                                       label: L("lcl_name"),
                                       onChange: "onChangePerson",
                                       trclass: "more",
+                                      filtercode: "MAIL",
                                       extracode: "E",
                                       extraParamField: "emailpersoon",
                                       whenEmpty: L("lcl_search_generic")  // want filter
@@ -376,12 +378,12 @@ url = "queuemail.asp?submit=1&pcode="+pcode+"&key="+pkey+"&xkey="+xkey+"&submitt
                                     });
 
             }
-            RWTEXTAREATR("emails", //pname,
-                         "fldemails required", //pclass,
-                         L("lcl_noti_sendto"), //plabel,
-                         safe.htmlattr(defaultemail) //pvalue,
-                         //params)
-                         );
+            RWTEXTAREATR("emails",
+                         "fldmaillist required",
+                         L("lcl_noti_sendto"),
+                         safe.htmlattr(defaultemail),
+                         {html: "rows='2' cols='60'"} // kan hier nog iets een nieuwe regel forceren?
+                        );
 
 %>