diff -ruN mailhandler-6.x-2.4-org/modules/mailhandler_default/mailhandler_default.feeds_importer_default.inc mailhandler-6.x-2.4-patched/modules/mailhandler_default/mailhandler_default.feeds_importer_default.inc
--- mailhandler-6.x-2.4-org/modules/mailhandler_default/mailhandler_default.feeds_importer_default.inc	2012-01-04 18:10:16.000000000 +0000
+++ mailhandler-6.x-2.4-patched/modules/mailhandler_default/mailhandler_default.feeds_importer_default.inc	2012-01-28 14:48:00.000000000 +0000
@@ -28,6 +28,7 @@
       'config' => array(
         'default_commands' => 'status: 1',
         'commands_failed_auth' => 'status: 0',
+        'enable_body_commands' => 1,
         'command_plugin' => array(
           'MailhandlerCommandsDefault' => 'MailhandlerCommandsDefault',
           'MailhandlerCommandsHeaders' => 'MailhandlerCommandsHeaders',
diff -ruN mailhandler-6.x-2.4-org/plugins/feeds/plugins/MailhandlerParser.inc mailhandler-6.x-2.4-patched/plugins/feeds/plugins/MailhandlerParser.inc
--- mailhandler-6.x-2.4-org/plugins/feeds/plugins/MailhandlerParser.inc	2012-01-04 18:10:16.000000000 +0000
+++ mailhandler-6.x-2.4-patched/plugins/feeds/plugins/MailhandlerParser.inc	2012-01-28 14:49:00.000000000 +0000
@@ -16,6 +16,7 @@
     return array(
       'default_commands' => 'status: 1',
       'commands_failed_auth' => 'status: 0',
+      'enable_body_commands' => 1,
       'available_commands' => 'status',
       'command_plugin' => array('MailhandlerCommandsDefault', 'MailhandlerCommandsFiles', 'MailhandlerCommandsHeaders'),
       'authenticate_plugin' => 'MailhandlerAuthenticateDefault',
diff -ruN mailhandler-6.x-2.4-org/plugins/mailhandler/commands/MailhandlerCommandsDefault.class.php mailhandler-6.x-2.4-patched/plugins/mailhandler/commands/MailhandlerCommandsDefault.class.php
--- mailhandler-6.x-2.4-org/plugins/mailhandler/commands/MailhandlerCommandsDefault.class.php	2012-01-04 18:10:16.000000000 +0000
+++ mailhandler-6.x-2.4-patched/plugins/mailhandler/commands/MailhandlerCommandsDefault.class.php	2012-01-28 17:23:00.000000000 +0000
@@ -17,15 +17,19 @@
   public function parse(&$message, $source) {
     $config = $source->importer->getConfig();
     // Prepend the default commands.
-    // User-added commands will override the default commands.
     if ($config['parser']['config']['default_commands']) {
-      $message['body_text'] = trim($config['parser']['config']['default_commands']) . "\n" . $message['body_text'];
+      $this->commands = $this->getCommands($config['parser']['config']['default_commands']);
+    } else {
+      $this->commands = array();
     }
-    $commands = $this->getCommands($message['body_text']);
-    $this->commands = $commands;
-    foreach ($commands as $key => $value) {
-      $message['body_html'] = preg_replace('/' . $key . ': ' . $value . '/', '', $message['body_html'], 1);
-      $message['body_html'] = preg_replace('/<br[^>\r\n]*>/', '', $message['body_html'], 1);
+    // Override default commands with commands from mail body.
+    if ($config['parser']['config']['enable_body_commands']) {
+      $commands = $this->getCommands($message['body_text']);
+      $this->commands = $commands + $this->commands; // order of operands ensures these commands override the default
+      foreach ($commands as $key => $value) {
+        $message['body_html'] = preg_replace('/' . $key . ': ' . $value . '/', '', $message['body_html'], 1);
+        $message['body_html'] = preg_replace('/<br[^>\r\n]*>/', '', $message['body_html'], 1);
+      }
     }
     if ($message['authenticated_uid'] == 0) {
       $commands = $this->getCommands($config['parser']['config']['commands_failed_auth']);
@@ -78,6 +82,11 @@
       '#description' => t('A set of commands that are added to each message by default, if the user is not authenticated. Should be in the form "key: value".'),
       '#default_value' => $config['commands_failed_auth'],
     );
+    $form['enable_body_commands'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Scan message body (until first blank line) for additional commands'),
+      '#default_value' => $config['enable_body_commands'],
+    );
   }
 
   function getMappingSources($config) {