diff --git a/inc/inc.ClassNotificationService.php b/inc/inc.ClassNotificationService.php
index 9dd23b033..bf585b22a 100644
--- a/inc/inc.ClassNotificationService.php
+++ b/inc/inc.ClassNotificationService.php
@@ -652,14 +652,13 @@ class SeedDMS_NotificationService {
 		if($newattributes) {
 			foreach($newattributes as $attrdefid=>$attribute) {
 				if(!isset($oldattributes[$attrdefid]) && $attribute) {
-					$subject = "document_attribute_changed_email_subject";
-					$message = "document_attribute_changed_email_body";
+					$subject = "document_attribute_added_email_subject";
+					$message = "document_attribute_added_email_body";
 					$params = array();
 					$params['name'] = $document->getName();
 					$params['document_id'] = $document->getId();
 					$params['attribute_name'] = $dms->getAttributeDefinition($attrdefid)->getName();
-					$params['attribute_old_value'] = '';
-					$params['attribute_new_value'] = $attribute->getValue();
+					$params['attribute_value'] = $attribute->getValue();
 					$params['folder_path'] = $folder->getFolderPathPlain();
 					$params['username'] = $user->getFullName();
 					$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
@@ -708,13 +707,12 @@ class SeedDMS_NotificationService {
 		if($newattributes) {
 			foreach($newattributes as $attrdefid=>$attribute) {
 				if(!isset($oldattributes[$attrdefid]) && $attribute) {
-					$subject = "folder_attribute_changed_email_subject";
-					$message = "folder_attribute_changed_email_body";
+					$subject = "folder_attribute_added_email_subject";
+					$message = "folder_attribute_added_email_body";
 					$params = array();
 					$params['name'] = $folder->getName();
 					$params['attribute_name'] = $dms->getAttributeDefinition($attrdefid)->getName();
-					$params['attribute_old_value'] = '';
-					$params['attribute_new_value'] = $attribute->getValue();
+					$params['attribute_value'] = $attribute->getValue();
 					$params['folder_path'] = $folder->getFolderPathPlain();
 					$params['username'] = $user->getFullName();
 					$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();