diff --git a/op/op.ApproveDocument.php b/op/op.ApproveDocument.php
index 98687c45e..953f4192e 100644
--- a/op/op.ApproveDocument.php
+++ b/op/op.ApproveDocument.php
@@ -101,27 +101,29 @@ if ($_POST["approvalType"] == "ind") {
 	}
 	else {
 		// Send an email notification to the document updater.
-		$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("approval_submit_email");
-		$message = getMLText("approval_submit_email")."\r\n";
-		$message .= 
-			getMLText("name").": ".$document->getName()."\r\n".
-			getMLText("version").": ".$version."\r\n".
-			getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n".
-			getMLText("status").": ".getApprovalStatusText($_POST["approvalStatus"])."\r\n".
-			getMLText("comment").": ".$comment."\r\n".
-			"URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."\r\n";
+		if($notifier) {
+			$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("approval_submit_email");
+			$message = getMLText("approval_submit_email")."\r\n";
+			$message .= 
+				getMLText("name").": ".$document->getName()."\r\n".
+				getMLText("version").": ".$version."\r\n".
+				getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n".
+				getMLText("status").": ".getApprovalStatusText($_POST["approvalStatus"])."\r\n".
+				getMLText("comment").": ".$comment."\r\n".
+				"URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."\r\n";
 
-		$subject=mydmsDecodeString($subject);
-		$message=mydmsDecodeString($message);
-		
-		LetoDMS_Email::toIndividual($user, $content->getUser(), $subject, $message);
+			$subject=mydmsDecodeString($subject);
+			$message=mydmsDecodeString($message);
+			
+			$notifier->toIndividual($user, $content->getUser(), $subject, $message);
 
-		// Send notification to subscribers.
-		$nl=$document->getNotifyList();
-		LetoDMS_Email::toList($user, $nl["users"], $subject, $message);
-		foreach ($nl["groups"] as $grp) {
-			LetoDMS_Email::toGroup($user, $grp, $subject, $message);
-		}
+			// Send notification to subscribers.
+			$nl=$document->getNotifyList();
+			$notifier->toList($user, $nl["users"], $subject, $message);
+			foreach ($nl["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message);
+			}
+		}
 	}
 }
 else if ($_POST["approvalType"] == "grp") {
@@ -154,28 +156,29 @@ else if ($_POST["approvalType"] == "grp") {
 	else {
 		// Send an email notification to the document updater.
 		$grp = $dms->getGroup($grpStatus["required"]);
-		
-		$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("approval_submit_email");
-		$message = getMLText("approval_submit_email")."\r\n";
-		$message .= 
-			getMLText("name").": ".$document->getName()."\r\n".
-			getMLText("version").": ".$version."\r\n".
-			getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n".
-			getMLText("status").": ".getApprovalStatusText($_POST["approvalStatus"])."\r\n".
-			getMLText("comment").": ".$comment."\r\n".
-			"URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."\r\n";
+		if($notifier) {
+			$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("approval_submit_email");
+			$message = getMLText("approval_submit_email")."\r\n";
+			$message .= 
+				getMLText("name").": ".$document->getName()."\r\n".
+				getMLText("version").": ".$version."\r\n".
+				getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n".
+				getMLText("status").": ".getApprovalStatusText($_POST["approvalStatus"])."\r\n".
+				getMLText("comment").": ".$comment."\r\n".
+				"URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."\r\n";
 
-		$subject=mydmsDecodeString($subject);
-		$message=mydmsDecodeString($message);
-		
-		LetoDMS_Email::toIndividual($user, $content->getUser(), $subject, $message);
+			$subject=mydmsDecodeString($subject);
+			$message=mydmsDecodeString($message);
+			
+			$notifier->toIndividual($user, $content->getUser(), $subject, $message);
 
-		// Send notification to subscribers.
-		$nl=$document->getNotifyList();
-		LetoDMS_Email::toList($user, $nl["users"], $subject, $message);
-		foreach ($nl["groups"] as $grp) {
-			LetoDMS_Email::toGroup($user, $grp, $subject, $message);
-		}
+			// Send notification to subscribers.
+			$nl=$document->getNotifyList();
+			$notifier->toList($user, $nl["users"], $subject, $message);
+			foreach ($nl["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message);
+			}
+		}
 	}
 }
 
diff --git a/op/op.RemoveVersion.php b/op/op.RemoveVersion.php
index bcd85c518..bf46e16a8 100644
--- a/op/op.RemoveVersion.php
+++ b/op/op.RemoveVersion.php
@@ -130,9 +130,9 @@ else {
 			
 			// Send notification to subscribers.
 			$nl=$document->getNotifyList();
-			LetoDMS_Email::toList($user, $nl["users"], $subject, $message);
+			$notifier->toList($user, $nl["users"], $subject, $message);
 			foreach ($nl["groups"] as $grp) {
-				LetoDMS_Email::toGroup($user, $grp, $subject, $message);
+				$notifier->toGroup($user, $grp, $subject, $message);
 			}
 		}
 	}
diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php
index 7cb21241a..ad31deb19 100644
--- a/op/op.ReviewDocument.php
+++ b/op/op.ReviewDocument.php
@@ -96,27 +96,29 @@ if ($_POST["reviewType"] == "ind") {
 	}
 	else {
 		// Send an email notification to the document updater.
-		$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("review_submit_email");
-		$message = getMLText("review_submit_email")."\r\n";
-		$message .= 
-			getMLText("name").": ".$document->getName()."\r\n".
-			getMLText("version").": ".$version."\r\n".
-			getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n".
-			getMLText("status").": ".getReviewStatusText($_POST["reviewStatus"])."\r\n".
-			getMLText("comment").": ".$comment."\r\n".
-			"URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."\r\n";
+		if($notifier) {
+			$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("review_submit_email");
+			$message = getMLText("review_submit_email")."\r\n";
+			$message .= 
+				getMLText("name").": ".$document->getName()."\r\n".
+				getMLText("version").": ".$version."\r\n".
+				getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n".
+				getMLText("status").": ".getReviewStatusText($_POST["reviewStatus"])."\r\n".
+				getMLText("comment").": ".$comment."\r\n".
+				"URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."\r\n";
 
-		$subject=mydmsDecodeString($subject);
-		$message=mydmsDecodeString($message);
-		
-		LetoDMS_Email::toIndividual($user, $content->getUser(), $subject, $message);
-		
-		// Send notification to subscribers.
-		$nl=$document->getNotifyList();
-		LetoDMS_Email::toList($user, $nl["users"], $subject, $message);
-		foreach ($nl["groups"] as $grp) {
-			LetoDMS_Email::toGroup($user, $grp, $subject, $message);
-		}
+			$subject=mydmsDecodeString($subject);
+			$message=mydmsDecodeString($message);
+			
+			$notifier->toIndividual($user, $content->getUser(), $subject, $message);
+
+			// Send notification to subscribers.
+			$nl=$document->getNotifyList();
+			$notifier->toList($user, $nl["users"], $subject, $message);
+			foreach ($nl["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message);
+			}
+		}
 	}
 }
 else if ($_POST["reviewType"] == "grp") {
@@ -148,28 +150,30 @@ else if ($_POST["reviewType"] == "grp") {
 	else {
 		// Send an email notification to the document updater.
 		$grp = $dms->getGroup($grpStatus["required"]);
-		
-		$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("review_submit_email");
-		$message = getMLText("review_submit_email")."\r\n";
-		$message .= 
-			getMLText("name").": ".$document->getName()."\r\n".
-			getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n".
-			getMLText("version").": ".$version."\r\n".
-			getMLText("status").": ".getReviewStatusText($_POST["reviewStatus"])."\r\n".
-			getMLText("comment").": ".$comment."\r\n".
-			"URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."\r\n";
 
-		$subject=mydmsDecodeString($subject);
-		$message=mydmsDecodeString($message);
-		
-		LetoDMS_Email::toIndividual($user, $content->getUser(), $subject, $message);
-		
-		// Send notification to subscribers.
-		$nl=$document->getNotifyList();
-		LetoDMS_Email::toList($user, $nl["users"], $subject, $message);
-		foreach ($nl["groups"] as $grp) {
-			LetoDMS_Email::toGroup($user, $grp, $subject, $message);
-		}
+		if($notifier) {
+			$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("review_submit_email");
+			$message = getMLText("review_submit_email")."\r\n";
+			$message .= 
+				getMLText("name").": ".$document->getName()."\r\n".
+				getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n".
+				getMLText("version").": ".$version."\r\n".
+				getMLText("status").": ".getReviewStatusText($_POST["reviewStatus"])."\r\n".
+				getMLText("comment").": ".$comment."\r\n".
+				"URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."\r\n";
+
+			$subject=mydmsDecodeString($subject);
+			$message=mydmsDecodeString($message);
+			
+			$notifier->toIndividual($user, $content->getUser(), $subject, $message);
+			
+			// Send notification to subscribers.
+			$nl=$document->getNotifyList();
+			$notifier->toList($user, $nl["users"], $subject, $message);
+			foreach ($nl["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message);
+			}
+		}
 	}
 }
 
@@ -276,33 +280,35 @@ if ($_POST["reviewStatus"]==-1){
 			// Notify approvers, if necessary.
 			if ($newStatus == S_DRAFT_APP) {
 				$requestUser = $document->getOwner();
-				
-				$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("approval_request_email");
-				$message = getMLText("approval_request_email")."\r\n";
-				$message .= 
-					getMLText("name").": ".$content->getOriginalFileName()."\r\n".
-					getMLText("version").": ".$version."\r\n".
-					getMLText("comment").": ".$content->getComment()."\r\n".
-					"URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."&version=".$version."\r\n";
 
-				$subject=mydmsDecodeString($subject);
-				$message=mydmsDecodeString($message);
-				
-				foreach ($docApprovalStatus as $dastat) {
-				
-					if ($dastat["status"] == 0) {
-						if ($dastat["type"] == 0) {
-
-							$approver = $dms->getUser($dastat["required"]);
-							LetoDMS_Email::toIndividual($document->getOwner(), $approver, $subject, $message);
-						}
-						else if ($dastat["type"] == 1) {
-						
-							$group = $dms->getGroup($dastat["required"]);
-							LetoDMS_Email::toGroup($document->getOwner(), $group, $subject, $message);
+				if($notifier) {
+					$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("approval_request_email");
+					$message = getMLText("approval_request_email")."\r\n";
+					$message .= 
+						getMLText("name").": ".$content->getOriginalFileName()."\r\n".
+						getMLText("version").": ".$version."\r\n".
+						getMLText("comment").": ".$content->getComment()."\r\n".
+						"URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."&version=".$version."\r\n";
+
+					$subject=mydmsDecodeString($subject);
+					$message=mydmsDecodeString($message);
+					
+					foreach ($docApprovalStatus as $dastat) {
+					
+						if ($dastat["status"] == 0) {
+							if ($dastat["type"] == 0) {
+	
+								$approver = $dms->getUser($dastat["required"]);
+								$notifier->toIndividual($document->getOwner(), $approver, $subject, $message);
+							}
+							else if ($dastat["type"] == 1) {
+							
+								$group = $dms->getGroup($dastat["required"]);
+								$notifier->toGroup($document->getOwner(), $group, $subject, $message);
+							}
 						}
 					}
-				}
+				}
 			}
 		}
 	}