diff --git a/packages/vtiger/mandatory/MailManager.zip b/packages/vtiger/mandatory/MailManager.zip
index 3625c8c96d3b2631eef15241b80d063ca180c93f..e56f22c20dc73fefeef2503bdcc6131e36d5e7ba 100644
Binary files a/packages/vtiger/mandatory/MailManager.zip and b/packages/vtiger/mandatory/MailManager.zip differ
diff --git a/pkg/vtiger/modules/MailManager/layouts/v7/modules/MailManager/resources/List.js b/pkg/vtiger/modules/MailManager/layouts/v7/modules/MailManager/resources/List.js
index 03030ec0f9ceb0f3c6da1cc93978dc493e0b7d8d..97d55852c944ee52efcb794d7b2e675783cde82c 100644
--- a/pkg/vtiger/modules/MailManager/layouts/v7/modules/MailManager/resources/List.js
+++ b/pkg/vtiger/modules/MailManager/layouts/v7/modules/MailManager/resources/List.js
@@ -308,21 +308,23 @@ Vtiger_List_Js("MailManager_List_Js", {}, {
 	 */
 	loadMailContents : function(folderName){
 		var mailids = jQuery('input[name="folderMailIds"]').val();
-		mailids = mailids.split(",");
-		var params = {
-			'module' : 'MailManager',
-			'action' : 'Folder',
-			'mode' : 'showMailContent',
-			'mailids' : mailids,
-			'folderName':folderName
-		};
-		app.request.post({"data" : params}).then(function(error, responseData) {
-			for(var k in responseData){
-				var messageContent = responseData[k];
-				var messageEle = jQuery('#mmMailEntry_'+k);
-				messageEle.find('.mmMailDesc').html(messageContent);
-			}
-		});
+		if (typeof mailids !== 'undefined') {
+			mailids = mailids.split(",");
+			var params = {
+				'module' : 'MailManager',
+				'action' : 'Folder',
+				'mode' : 'showMailContent',
+				'mailids' : mailids,
+				'folderName':folderName
+			};
+			app.request.post({"data" : params}).then(function(error, responseData) {
+				for(var k in responseData){
+					var messageContent = responseData[k];
+					var messageEle = jQuery('#mmMailEntry_'+k);
+					messageEle.find('.mmMailDesc').html(messageContent);
+				}
+			});
+		}
 	},
 
 	registerFolderMailDeleteEvent : function() {