diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index 2b3fd6deea..e7e3a227b7 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -204,8 +204,7 @@
   .et2_selectbox .ui-multiselect-checkboxes div.ui-icon-close {
     /*visibility: hidden;*/
     background-image: url(../images/close.png);
-    background: #FFFFFF;
-    margin: 2px;
+    margin: -2px -3px;
     padding: 0px;
   }
   /**
@@ -2990,13 +2989,6 @@ div#popupMainDiv > * {
 form.et2_container {
   padding: 0;
 }
-form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget select,
-form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input {
-  padding-right: 0;
-  padding-top: 0;
-  padding-bottom: 0;
-  font-size: 0.95em;
-}
 form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input {
   margin: 4px 5px 4px 0;
   -webkit-border-top-right-radius: 3px;
@@ -3639,12 +3631,11 @@ td.lettersearch {
   cursor: pointer;
 }
 #egwpopup #egwpopup_list .egwpopup_message {
-  height: 140px;
+  height: auto;
   overflow: hidden;
   padding: 10px;
   background-color: #fafafa;
-  border-radius: 3px;
-  margin-bottom: 10px;
+  margin-bottom: 5px;
 }
 #egwpopup #egwpopup_list .egwpopup_message:hover {
   background-color: rgba(103, 159, 210, 0.2);
@@ -3676,8 +3667,6 @@ td.lettersearch {
   display: none;
 }
 #egwpopup #egwpopup_list .egwpopup_message .egwpopup_actions_container {
-  border-bottom: 1px solid silver;
-  padding-bottom: 5px;
   text-align: center;
 }
 #egwpopup #egwpopup_list .egwpopup_message .egwpopup_actions_container > button {
@@ -3733,6 +3722,7 @@ td.lettersearch {
 #egwpopup #egwpopup_list .egwpopup_message_clone {
   border: 2px dashed silver;
   opacity: 0.3;
+  height: 125px;
 }
 #egwpopup div#egwpopup_header {
   font-size: 16px;
@@ -3833,9 +3823,9 @@ td.lettersearch {
 }
 #egwpopup_fw_notifications .popup_note {
   position: absolute;
-  width: 260px;
+  width: 280px;
   height: 30px;
-  left: -273px;
+  left: -293px;
   top: -8px;
   border: 1px solid silver;
   background: #ffffff;
@@ -3843,6 +3833,7 @@ td.lettersearch {
   font-size: 10pt;
   line-height: 22pt;
   color: #b9436c;
+  white-space: nowrap;
 }
 #egwpopup_fw_notifications .popup_note:before {
   content: '';
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index 6e37e0fadb..3fea478ae3 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -3620,12 +3620,11 @@ td.lettersearch {
   cursor: pointer;
 }
 #egwpopup #egwpopup_list .egwpopup_message {
-  height: 140px;
+  height: auto;
   overflow: hidden;
   padding: 10px;
   background-color: #fafafa;
-  border-radius: 3px;
-  margin-bottom: 10px;
+  margin-bottom: 5px;
 }
 #egwpopup #egwpopup_list .egwpopup_message:hover {
   background-color: rgba(103, 159, 210, 0.2);
@@ -3657,8 +3656,6 @@ td.lettersearch {
   display: none;
 }
 #egwpopup #egwpopup_list .egwpopup_message .egwpopup_actions_container {
-  border-bottom: 1px solid silver;
-  padding-bottom: 5px;
   text-align: center;
 }
 #egwpopup #egwpopup_list .egwpopup_message .egwpopup_actions_container > button {
@@ -3714,6 +3711,7 @@ td.lettersearch {
 #egwpopup #egwpopup_list .egwpopup_message_clone {
   border: 2px dashed silver;
   opacity: 0.3;
+  height: 125px;
 }
 #egwpopup div#egwpopup_header {
   font-size: 16px;
diff --git a/pixelegg/less/layout_messages.less b/pixelegg/less/layout_messages.less
index 188074b1ed..e95bfe3863 100755
--- a/pixelegg/less/layout_messages.less
+++ b/pixelegg/less/layout_messages.less
@@ -86,12 +86,11 @@
 			cursor: pointer;
 		}
 		.egwpopup_message {
-            height: 140px;
+            height: auto;
             overflow: hidden;
 			padding: 10px;
 			background-color: #fafafa;
-			border-radius: 3px;
-			margin-bottom: 10px;
+			margin-bottom: 5px;
 			&:hover {
 				background-color: rgba(103, 159, 210, 0.2);
 			}
@@ -120,8 +119,6 @@
 				.egwpopup_collapse {display: none;}
 			}
 			.egwpopup_actions_container {
-				border-bottom: 1px solid silver;
-				padding-bottom: 5px;
 				text-align: center;
 			}
 			.egwpopup_actions_container>button {
@@ -173,6 +170,7 @@
 		.egwpopup_message_clone {
 			border:2px dashed silver;
 			opacity: 0.3;
+			height: 125px;
 		}
 	}
 	div#egwpopup_header {
diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css
index a3f86c1565..3b39e8f663 100644
--- a/pixelegg/mobile/fw_mobile.css
+++ b/pixelegg/mobile/fw_mobile.css
@@ -215,8 +215,7 @@
   .et2_selectbox .ui-multiselect-checkboxes div.ui-icon-close {
     /*visibility: hidden;*/
     background-image: url(../images/close.png);
-    background: #FFFFFF;
-    margin: 2px;
+    margin: -2px -3px;
     padding: 0px;
   }
   /**
@@ -3001,13 +3000,6 @@ div#popupMainDiv > * {
 form.et2_container {
   padding: 0;
 }
-form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget select,
-form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input {
-  padding-right: 0;
-  padding-top: 0;
-  padding-bottom: 0;
-  font-size: 0.95em;
-}
 form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input {
   margin: 4px 5px 4px 0;
   -webkit-border-top-right-radius: 3px;
@@ -3650,12 +3642,11 @@ td.lettersearch {
   cursor: pointer;
 }
 #egwpopup #egwpopup_list .egwpopup_message {
-  height: 140px;
+  height: auto;
   overflow: hidden;
   padding: 10px;
   background-color: #fafafa;
-  border-radius: 3px;
-  margin-bottom: 10px;
+  margin-bottom: 5px;
 }
 #egwpopup #egwpopup_list .egwpopup_message:hover {
   background-color: rgba(103, 159, 210, 0.2);
@@ -3687,8 +3678,6 @@ td.lettersearch {
   display: none;
 }
 #egwpopup #egwpopup_list .egwpopup_message .egwpopup_actions_container {
-  border-bottom: 1px solid silver;
-  padding-bottom: 5px;
   text-align: center;
 }
 #egwpopup #egwpopup_list .egwpopup_message .egwpopup_actions_container > button {
@@ -3744,6 +3733,7 @@ td.lettersearch {
 #egwpopup #egwpopup_list .egwpopup_message_clone {
   border: 2px dashed silver;
   opacity: 0.3;
+  height: 125px;
 }
 #egwpopup div#egwpopup_header {
   font-size: 16px;
@@ -3844,9 +3834,9 @@ td.lettersearch {
 }
 #egwpopup_fw_notifications .popup_note {
   position: absolute;
-  width: 260px;
+  width: 280px;
   height: 30px;
-  left: -273px;
+  left: -293px;
   top: -8px;
   border: 1px solid silver;
   background: #ffffff;
@@ -3854,6 +3844,7 @@ td.lettersearch {
   font-size: 10pt;
   line-height: 22pt;
   color: #b9436c;
+  white-space: nowrap;
 }
 #egwpopup_fw_notifications .popup_note:before {
   content: '';