diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 26d375fc63..7886ba231b 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -1739,7 +1739,7 @@ unset($query['actions']);
 				if (function_exists('mb_convert_variables')) mb_convert_variables("UTF-8","ISO-8559-1",$value['name']); # iso 2 UTF8
 				//if (mb_convert_variables("ISO-8859-1","UTF-8",$value['name'])){echo "Juhu utf8 2 ISO\n";};
 				//echo $value['name']."\n";
-				$filename=htmlentities($value['name'], ENT_QUOTES, $detectedCharSet);
+				//$filename=htmlentities($value['name'], ENT_QUOTES, $detectedCharSet);
 				$attachmentHTML[$key]['filename']= ($value['name'] ? ( $filename ? $filename : $value['name'] ) : lang('(no subject)'));
 				$attachmentHTML[$key]['type']=$value['mimeType'];
 				$attachmentHTML[$key]['mimetype']=mime_magic::mime2label($value['mimeType']);
diff --git a/mail/js/app.js b/mail/js/app.js
index e5bf444a7d..c9835967fd 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -492,7 +492,7 @@ app.mail = AppJS.extend(
 			this.et2.getWidgetById('previewToAddress').set_value("");
 			this.et2.getWidgetById('previewDate').set_value("");
 			this.et2.getWidgetById('previewSubject').set_value("");
-			//this.et2.getWidgetById('previewAttachmentArea').set_value("");
+			this.et2.getWidgetById('previewAttachmentArea').set_value({content:[]});
 			this.et2.getWidgetById('previewAttachmentArea').set_class('previewAttachmentArea noContent mail_DisplayNone');
 			var IframeHandle = this.et2.getWidgetById('messageIFRAME');
 			IframeHandle.set_src(egw.link('/index.php',{menuaction:'mail.mail_ui.loadEmailBody',_messageID:""}));
@@ -513,9 +513,7 @@ app.mail = AppJS.extend(
 		}
 		else
 		{
-			var pAttArea = this.et2.getWidgetById('previewAttachmentArea');
-			console.log(dataElem.data.attachmentsBlock,pAttArea);
-			//pAttArea.createTableFromCells(pAttArea.cells,pAttArea.colData,dataElem.data.attachmentsBlock);
+			this.et2.getWidgetById('previewAttachmentArea').set_value({content:dataElem.data.attachmentsBlock});
 		}
 		this.et2.getWidgetById('toolbar').set_actions(JSON.parse(dataElem.data.toolbaractions));
 		var IframeHandle = this.et2.getWidgetById('messageIFRAME');
diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 1f3e8b16d1..2151f4e791 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -282,6 +282,11 @@ pre {
 	width: 250px;
 	white-space: nowrap;
 	overflow: hidden;
+	word-wrap: break-word;
+	float: left;
+	&:after{
+		content: " ...";
+	}
 }
 #mail-index {
 	position: relative
@@ -439,9 +444,11 @@ input[type=button] {
 	opacity: 1;
 	-moz-opacity:1:
 	filter: Alpha(opacity=100);
+	display: inline-block !important;
 }
 #mail-index_previewAttachmentArea.noContent {
 	border:0px !important;
+	display: none !important;
 }
 
 .mailDisplayContainer, .mailDisplayAttachments {