Index: lib/model/doctrine/PluginDeletedMessageTable.class.php
===================================================================
--- lib/model/doctrine/PluginDeletedMessageTable.class.php	(リビジョン 13346)
+++ lib/model/doctrine/PluginDeletedMessageTable.class.php	(作業コピー)
@@ -131,9 +131,10 @@
    * @param int $message_id
    * @return boolean 
    */
-  public function restoreMessage($message_id)
+  public function restoreMessage($message_id, $member_id = null)
   {
-    $deleted_message = $this->find($message_id);
+    $member_id = $member_id ? $member_id : sfContext::getInstance()->getUser()->getMemberId();
+    $deleted_message = $this->findOneByIdAndMemberId($message_id, $member_id);
     if (!$deleted_message) {
       return false;
     }
Index: lib/action/opMessagePluginMessageActions.class.php
===================================================================
--- lib/action/opMessagePluginMessageActions.class.php	(リビジョン 13346)
+++ lib/action/opMessagePluginMessageActions.class.php	(作業コピー)
@@ -177,7 +177,7 @@
     }
     $this->forward404Unless(
       Doctrine::getTable('DeletedMessage')->deleteMessage(
-        sfContext::getInstance()->getUser()->getMemberId(),
+        $this->getUser()->getMemberId(),
         $request->getParameter('id'),
         $objectName
       )
@@ -195,7 +195,7 @@
   {
     $request->checkCSRFProtection();
 
-    Doctrine::getTable('DeletedMessage')->restoreMessage($request->getParameter('id'));
+    $this->forward404Unless(Doctrine::getTable('DeletedMessage')->restoreMessage($request->getParameter('id')));
     $this->redirect('@dustList');
   }