diff --git a/CHANGELOG b/CHANGELOG
index 53dd80984..6284cea92 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 --------------------------------------------------------------------------------
 - fix list of previous document versions (Closes: #471)
 - fix uploading files with fine uploader (Closes: #472)
+- clear revision date when all revisors have been deleted
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.9
diff --git a/op/op.SetRevisors.php b/op/op.SetRevisors.php
index 56cff04d6..8314c506c 100644
--- a/op/op.SetRevisors.php
+++ b/op/op.SetRevisors.php
@@ -212,7 +212,7 @@ if (count($revisionIndex["i"]) > 0) {
 						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("recipient_already_removed"));
 						break;
 					case -4:
-						// email error
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("recipient_was_active"));
 						break;
 				}
 			}
@@ -315,7 +315,7 @@ if (count($revisionIndex["g"]) > 0) {
 						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("recipient_already_removed"));
 						break;
 					case -4:
-						// email error
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("recipient_was_active"));
 						break;
 				}
 			}
@@ -323,6 +323,11 @@ if (count($revisionIndex["g"]) > 0) {
 	}
 }
 
+/* If all revisors has been removed, then clear the next revision date */
+if(!$pIndRev && !$pGrpRev) {
+	$content->setRevisionDate(false);
+}
+
 /* Recheck status, because all revisors could have been removed */
 $content->verifyStatus(false, $user, getMLText('automatic_status_update'), $settings->_initialDocumentStatus);