diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php
index fffd9b285d..7f8791aca4 100644
--- a/module/doc/lang/de.php
+++ b/module/doc/lang/de.php
@@ -336,10 +336,10 @@ $lang->doc->customShowLibsList['children'] = 'Display Child-category Documents';
 $lang->doc->customShowLibsList['unclosed'] = "Display Active {$lang->executionCommon}s Only";
 
 $lang->doc->mail = new stdclass();
-$lang->doc->mail->create = new stdclass();
-$lang->doc->mail->edit   = new stdclass();
-$lang->doc->mail->create->title = "%s created document #%s:%s";
-$lang->doc->mail->edit->title   = "%s edited document #%s:%s";
+$lang->doc->mail->releasedDoc = new stdclass();
+$lang->doc->mail->edit        = new stdclass();
+$lang->doc->mail->releasedDoc->title = "%s released document #%s:%s";
+$lang->doc->mail->edit->title        = "%s edited document #%s:%s";
 
 $lang->doc->confirmDelete        = "Möchten Sie dieses Dokument löschen?";
 $lang->doc->confirmDeleteLib     = "Möchten Sie diese Bibliothek löschen?";
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index 05e31e2737..74ee4a9bb6 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -336,10 +336,10 @@ $lang->doc->customShowLibsList['children'] = 'Display Child-category Documents';
 $lang->doc->customShowLibsList['unclosed'] = "Display Active {$lang->executionCommon}s Only";
 
 $lang->doc->mail = new stdclass();
-$lang->doc->mail->create = new stdclass();
-$lang->doc->mail->edit   = new stdclass();
-$lang->doc->mail->create->title = "%s created document #%s:%s";
-$lang->doc->mail->edit->title   = "%s edited document #%s:%s";
+$lang->doc->mail->releasedDoc = new stdclass();
+$lang->doc->mail->edit        = new stdclass();
+$lang->doc->mail->releasedDoc->title = "%s released document #%s:%s";
+$lang->doc->mail->edit->title        = "%s edited document #%s:%s";
 
 $lang->doc->confirmDelete        = "Do you want to delete this document?";
 $lang->doc->confirmDeleteLib     = "Do you want to delete this document library?";
diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php
index c16589761b..7cc9dc6b45 100644
--- a/module/doc/lang/fr.php
+++ b/module/doc/lang/fr.php
@@ -336,10 +336,10 @@ $lang->doc->customShowLibsList['children'] = 'Montrer sous-catégorie de Documen
 $lang->doc->customShowLibsList['unclosed'] = "Montrer {$lang->executionCommon}s actifs seulement";
 
 $lang->doc->mail = new stdclass();
-$lang->doc->mail->create = new stdclass();
-$lang->doc->mail->edit   = new stdclass();
-$lang->doc->mail->create->title = "%s created document #%s:%s";
-$lang->doc->mail->edit->title   = "%s edited document #%s:%s";
+$lang->doc->mail->releasedDoc = new stdclass();
+$lang->doc->mail->edit        = new stdclass();
+$lang->doc->mail->releasedDoc->title = "%s released document #%s:%s";
+$lang->doc->mail->edit->title        = "%s edited document #%s:%s";
 
 $lang->doc->confirmDelete        = "Voulez-vous supprimer ce document ?";
 $lang->doc->confirmDeleteLib     = "Voulez-vous supprimer cette Bibliothèque ?";
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index 461045c3ff..778fa09391 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -336,10 +336,10 @@ $lang->doc->customShowLibsList['children'] = '显示子分类的文档';
 $lang->doc->customShowLibsList['unclosed'] = '只显示未关闭的' . $lang->executionCommon;
 
 $lang->doc->mail = new stdclass();
-$lang->doc->mail->create = new stdclass();
-$lang->doc->mail->edit   = new stdclass();
-$lang->doc->mail->create->title = "%s创建了文档 #%s:%s";
-$lang->doc->mail->edit->title   = "%s编辑了文档 #%s:%s";
+$lang->doc->mail->releasedDoc = new stdclass();
+$lang->doc->mail->edit        = new stdclass();
+$lang->doc->mail->releasedDoc->title = "%s发布了文档 #%s:%s";
+$lang->doc->mail->edit->title        = "%s编辑了文档 #%s:%s";
 
 $lang->doc->confirmDelete        = "您确定删除该文档吗？";
 $lang->doc->confirmDeleteLib     = "您确定删除该文档库吗？";
diff --git a/module/mail/model.php b/module/mail/model.php
index 887750ecd6..b38d986749 100644
--- a/module/mail/model.php
+++ b/module/mail/model.php
@@ -663,7 +663,7 @@ class mailModel extends model
         {
             $this->app->loadLang('doc');
 
-            if($actionType == 'created') $titleType = 'create';
+            if($actionType == 'releaseddoc') $titleType = 'releasedDoc';
             return sprintf($this->lang->doc->mail->{$titleType}->title, $this->app->user->realname, $object->id, $object->title);
         }
 
diff --git a/module/message/model.php b/module/message/model.php
index 8636c8d72f..889dced923 100755
--- a/module/message/model.php
+++ b/module/message/model.php
@@ -249,11 +249,10 @@ class messageModel extends model
         if(empty($toList) && $objectType == 'mr')          $toList = $object->createdBy . ',' . $object->assignee;
         if(empty($toList) and $objectType == 'demandpool') $toList = trim($object->owner, ',') . ',' . trim($object->reviewer, ',');
         if(empty($toList) and $objectType == 'feedback')   $toList = $object->openedBy;
-        if(empty($toList) && $objectType == 'doc')         $toList = $object->mailto;
-        if(empty($toList) && $objectType == 'release')
+        if(empty($toList) && in_array($objectType, array('release', 'doc')))
         {
             list($toList, $ccList) = $this->loadModel($objectType)->getToAndCcList($object);
-            $toList = $toList . $ccList;
+            $toList = $toList . ',' . $ccList;
         }
         if(empty($toList) && $objectType == 'task' && $object->mode == 'multi')
         {