Index: program/steps/mail/compose.inc
===================================================================
--- program/steps/mail/compose.inc	(revision e5d60d69d4108a0e62270548117773244ca1905e)
+++ program/steps/mail/compose.inc	(revision 8abe5485fd797ee17a6da13ebec7b6d7a3411b92)
@@ -445,10 +445,9 @@
     else if ($compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT)
       $body = rcmail_create_draft_body($body, $isHtml);
-
-    $plugin = $RCMAIL->plugins->exec_hook('message_compose_body',
-      array('body' => $body, 'html' => $isHtml, 'mode' => $compose_mode));
-
-    $body = $plugin['body'];  
-  }
+  }
+
+  $plugin = $RCMAIL->plugins->exec_hook('message_compose_body',
+    array('body' => $body, 'html' => $isHtml, 'mode' => $compose_mode));
+  $body = $plugin['body'];  
 
   $out = $form_start ? "$form_start\n" : '';