diff --git a/library/includes/functions_admin.php b/library/includes/functions_admin.php
index 6cf8dea6a..cb53f9ed9 100644
--- a/library/includes/functions_admin.php
+++ b/library/includes/functions_admin.php
@@ -360,9 +360,7 @@ function topic_delete($mode_or_topic_id, $forum_id = null, $prune_time = 0, $pru
 	');
 
     // Log action
-    if ($prune) {
-        // TODO
-    } else {
+    if (!$prune) {
         foreach ($log_topics as $row) {
             if ($row['topic_status'] == TOPIC_MOVED) {
                 $row['topic_title'] = '<i>' . trans('messages.TOPIC_MOVED') . '</i> ' . $row['topic_title'];
diff --git a/library/includes/functions_post.php b/library/includes/functions_post.php
index b50fb88eb..63e505066 100644
--- a/library/includes/functions_post.php
+++ b/library/includes/functions_post.php
@@ -41,8 +41,7 @@ function prepare_post(&$mode, &$post_data, &$error_msg, &$username, &$subject, &
     }
 
     // Check message
-    if (!empty($message)) {
-    } elseif ($mode != 'delete') {
+    if (empty($message) && $mode != 'delete') {
         $error_msg .= (!empty($error_msg)) ? '<br />' . trans('messages.EMPTY_MESSAGE') : trans('messages.EMPTY_MESSAGE');
     }