diff --git a/pkg/vtiger/modules/EmailTemplates/layouts/v7/modules/EmailTemplates/resources/List.js b/pkg/vtiger/modules/EmailTemplates/layouts/v7/modules/EmailTemplates/resources/List.js
index 6e6af01d242aeff231c9fc8c47cd056e669bcfd3..3c560bf8c2a5dfee675c171f7fab988445914758 100644
--- a/pkg/vtiger/modules/EmailTemplates/layouts/v7/modules/EmailTemplates/resources/List.js
+++ b/pkg/vtiger/modules/EmailTemplates/layouts/v7/modules/EmailTemplates/resources/List.js
@@ -222,40 +222,6 @@ Vtiger_List_Js("EmailTemplates_List_Js", {
         });
     },
     
-    /**
-     * Function to prompt before deleting the template
-     */
-    registerPromptTemplateDeleteEvent: function () {
-        var thisInstance = this;
-        jQuery('#listViewContent').on('click', '.fa-trash', function (e) {
-            var templateId = jQuery(e.currentTarget).attr('data-value');
-            var message = app.vtranslate('JS_LBL_ARE_YOU_SURE_YOU_WANT_TO_DELETE');
-            app.helper.showConfirmationBox({message: message}).then(function(e){
-                thisInstance.registerTemplateDeleteEvent(templateId);
-            }, function (error, err) {
-                // if error occurred
-            });
-        });
-    },
-    
-    /**
-     * Function to delete the template 
-     */
-    registerTemplateDeleteEvent: function (templateId) {
-        var params = {
-            'module': "EmailTemplates",
-            'action': "Delete",
-            'record': templateId,
-            'ajaxDelete': true,
-        };
-        app.request.post({data:params}).then(function (error,data) {
-            if (data) {
-                window.location.href = data;
-            }
-         });
-    },
-    
-    
      loadListViewRecords : function(urlParams) {
         var self = this;
         var aDeferred = jQuery.Deferred();
@@ -276,7 +242,7 @@ Vtiger_List_Js("EmailTemplates_List_Js", {
             app.helper.hideProgress();
             self.markSelectedIdsCheckboxes();
             self.registerDynamicListHeaders();
-            
+            self.registerDeleteRecordClickEvent();
             self.registerDynamicDropdownPosition();
             self.registerDropdownPosition();//for every ajax request more-drop down in listview
         });
@@ -330,7 +296,6 @@ Vtiger_List_Js("EmailTemplates_List_Js", {
         this.registerAccordionClickEvent();
         this.registerViewType();
         this.registerThumbnailHoverActionEvent();
-        this.registerPromptTemplateDeleteEvent();
         this.registerTemplateDuplicationEvent();
         this.registerTemplateEditEvent();
         this.registerPreviewTemplateEvent();
diff --git a/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/actions/MassDelete.php b/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/actions/MassDelete.php
index 9475702e6a836fcd303149ba49536c5a92122e8b..2b1f23b9a02cbf1a924961ac5db85eb12bcd5bda 100644
--- a/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/actions/MassDelete.php
+++ b/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/actions/MassDelete.php
@@ -45,12 +45,20 @@ class EmailTemplates_MassDelete_Action extends Vtiger_Mass_Action {
 			$recordIds = $this->getRecordsListFromRequest($request, $recordModel);
 			foreach($recordIds as $recordId) {
 				$recordModel = EmailTemplates_Record_Model::getInstanceById($recordId);
-				$recordModel->delete();
+				if($recordModel->isSystemTemplate()) {
+                    $systemTemplate = true;
+                } else {
+                    $recordModel->delete();
+                }
 			}
 		}
 		
 		$response = new Vtiger_Response();
-		$response->setResult(array('module'=>$moduleName));
+		if($systemTemplate) {
+			 $response->setError('502', vtranslate('LBL_NO_PERMISSIONS_TO_DELETE_SYSTEM_TEMPLATE', $moduleName));
+        } else {
+			$response->setResult(array('module'=>$moduleName));
+		}
 		$response->emit();
 	}