diff --git a/dev/Model/Attachment.js b/dev/Model/Attachment.js
index 62c7a2585..5a9b01b11 100644
--- a/dev/Model/Attachment.js
+++ b/dev/Model/Attachment.js
@@ -186,7 +186,7 @@ class AttachmentModel extends AbstractModel {
 		this.isLinked = false;
 		this.isThumbnail = false;
 		this.cid = '';
-		this.cidWithOutTags = '';
+		this.cidWithoutTags = '';
 		this.contentLocation = '';
 		this.download = '';
 		this.folder = '';
@@ -215,7 +215,10 @@ class AttachmentModel extends AbstractModel {
 			this.mimeType = ((json.MimeType || '').toLowerCase()).trim();
 			this.fileName = json.FileName.trim();
 			this.estimatedSize = pInt(json.EstimatedSize);
+			// if it is inline
 			this.isInline = !!json.IsInline;
+			// if inline image is linked with CID in html
+			// and 'src="cid:' or background-image:url(cid:)
 			this.isLinked = !!json.IsLinked;
 			this.isThumbnail = !!json.IsThumbnail;
 			this.cid = json.CID;
@@ -228,7 +231,7 @@ class AttachmentModel extends AbstractModel {
 			this.framed = !!json.Framed;
 
 			this.friendlySize = friendlySize(this.estimatedSize);
-			this.cidWithOutTags = this.cid.replace(/^<+/, '').replace(/>+$/, '');
+			this.cidWithoutTags = this.cid.replace(/^<+/, '').replace(/>+$/, '');
 
 			this.fileNameExt = getFileExtension(this.fileName);
 			this.fileType = staticFileType(this.fileNameExt, this.mimeType);
diff --git a/dev/Model/AttachmentCollection.js b/dev/Model/AttachmentCollection.js
index 9dfb52788..d817835ae 100644
--- a/dev/Model/AttachmentCollection.js
+++ b/dev/Model/AttachmentCollection.js
@@ -9,15 +9,12 @@ export class AttachmentCollectionModel extends AbstractCollectionModel
 	 * @param {?Array} json
 	 * @returns {AttachmentCollectionModel}
 	 */
-	static reviveFromJson(items, foundedCIDs) {
+	static reviveFromJson(items) {
 		let result = new AttachmentCollectionModel;
 		items = this.getFromJSON(items, 'AttachmentCollection') || items;
 		Array.isArray(items) && items.forEach(attachment => {
 			attachment = AttachmentModel.newInstanceFromJson(attachment);
 			if (attachment) {
-				if (attachment.cidWithOutTags && foundedCIDs.includes(attachment.cidWithOutTags)) {
-					attachment.isLinked = true;
-				}
 				result.push(attachment);
 			}
 		});
@@ -37,6 +34,6 @@ export class AttachmentCollectionModel extends AbstractCollectionModel
 	 */
 	findByCid(cid) {
 		cid = cid.replace(/^<+|>+$/, '');
-		return this.find(item => cid === item.cidWithOutTags);
+		return this.find(item => cid === item.cidWithoutTags);
 	}
 }