diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js
index 2aee5709e..e5ae9b746 100644
--- a/dev/View/User/MailBox/MessageView.js
+++ b/dev/View/User/MailBox/MessageView.js
@@ -33,6 +33,7 @@ import { SMAudio } from 'Common/Audio';
 
 import { i18n } from 'Common/Translator';
 import { attachmentDownload } from 'Common/Links';
+import { FileInfo } from 'Common/File';
 
 import { MessageFlagsCache } from 'Common/Cache';
 
@@ -77,13 +78,12 @@ const
 					// if (cd && 'attachment' === cd.value) {
 					let attachment = new AttachmentModel;
 					attachment.mimeType = type.value;
-					attachment.fileName = (type.name || (cd && cd.params.filename));
+					attachment.fileName = type.name || (cd && cd.params.filename) || '';
+					attachment.fileNameExt = attachment.fileName.replace(/^.+(\.[a-z]+)$/, '$1');
+					attachment.fileType = FileInfo.getType('', type.value);
 					attachment.url = part.dataUrl;
+					attachment.friendlySize = FileInfo.friendlySize(part.body.length);
 /*
-					attachment.fileNameExt = '';
-					attachment.fileType = FileType.Unknown;
-					attachment.friendlySize = '';
-					attachment.isLinked(false);
 					attachment.isThumbnail = false;
 					attachment.contentLocation = '';
 					attachment.download = '';
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
index ed9408caf..69b2c5901 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
@@ -241,7 +241,7 @@
 											<div class="attachmentSize" data-bind="text: friendlySize"></div>
 										</div>
 										<div class="checkboxAttachment fontastic"
-												data-bind="text: checked() ? '☑' : '☐',
+												data-bind="visible: download, text: checked() ? '☑' : '☐',
 												click: function () { checked(!checked()); return false }"></div>
 									</li>
 								</ul>