diff --git a/pkg/vtiger/modules/MailManager/modules/MailManager/models/Message.php b/pkg/vtiger/modules/MailManager/modules/MailManager/models/Message.php
index d9062f6f7772dce9600b1aebb7bdb45f7f5a2972..d0103058fa02ff565e96a01ed3e0ba11ae8974c2 100644
--- a/pkg/vtiger/modules/MailManager/modules/MailManager/models/Message.php
+++ b/pkg/vtiger/modules/MailManager/modules/MailManager/models/Message.php
@@ -276,7 +276,8 @@ class MailManager_Message_Model extends Vtiger_MailRecord  {
 						if(file_exists($saved_filename)) $fileContent = @fread(fopen($saved_filename, "r"), filesize($saved_filename));
 					}
 					if(!empty($atResultRow['cid'])) {
-						$this->_inline_attachments[] = array('filename'=>$atResultRow['aname'], 'cid'=>$atResultRow['cid']);
+						// In _inline_attachments passing 'atid' => $atResultRow['attachid'];
+						$this->_inline_attachments[] = array('filename'=>$atResultRow['aname'], 'cid'=>$atResultRow['cid'], 'atid' => $atResultRow['attachid']);
 					}
 					$filePath = $atResultRow['path'].$atResultRow['attachid'].'_'.sanitizeUploadFileName($atResultRow['aname'], vglobal('upload_badext'));
 					$fileSize = $this->convertFileSize(filesize($filePath));
diff --git a/pkg/vtiger/modules/MailManager/modules/MailManager/views/Mail.php b/pkg/vtiger/modules/MailManager/modules/MailManager/views/Mail.php
index 8ab494e8aca1e5414b2a8fefa036dce210b8f334..a59376f13394f163647ae2f85f865a481c68a9f2 100755
--- a/pkg/vtiger/modules/MailManager/modules/MailManager/views/Mail.php
+++ b/pkg/vtiger/modules/MailManager/modules/MailManager/views/Mail.php
@@ -42,9 +42,13 @@ class MailManager_Mail_View extends MailManager_Abstract_View {
 					$cid = $att['cid'];
 					$attch_name = Vtiger_MailRecord::__mime_decode($att['filename']);
 					$id = $mail->muid();
-					$src = "index.php?module=MailManager&view=Index&_operation=mail&_operationarg=attachment_dld&_muid=$id&_atname=".urlencode($attch_name);
+					// attachment id from $att
+					$attId = $att['atid'];
+					// passing in the url : 
+					$src = "index.php?module=MailManager&view=Index&_operation=mail&_operationarg=attachment_dld&_muid=$id&_atid=$attId&_atname=".urlencode($attch_name);
 					$body = preg_replace('/cid:'.$cid.'/', $src, $body);
-					$inline_cid[$attch_name] = $cid;
+					// before we used to pass $attach_name, changed to $att['atid'] or $attId
+					$inline_cid[$attId] = $cid;
 				}
 			}
 			$viewer->assign('INLINE_ATT', $inline_cid);