diff --git a/views_send.module b/views_send.module
index e521628..1759eec 100644
--- a/views_send.module
+++ b/views_send.module
@@ -30,7 +30,7 @@ define('VIEWS_SEND_TOKEN_POSTFIX', ']');
  * Detect if there is MIME support (through modules like Mime Mail or Mandrill).
  */
 switch (true) {
-  case (module_exists('htmlmail') && module_exists('mailmime')):
+  case (module_exists('htmlmail') && (module_exists('mailmime') || module_exists('mailsystem')):
   case module_exists('mailgun'):
   case module_exists('mandrill'):
   case module_exists('mimemail'):
@@ -774,7 +774,11 @@ function views_send_queue_mail($params, $selected_rows, $view) {
 
     // Enable other modules to alter the actual message before queueing it
     // by providing the hook 'views_send_mail_alter'.
-    drupal_alter('views_send_mail', $message);
+    $views_send_token_data = array(
+      'keys' => $token_keys,
+      'values' => $token_values,
+    );
+    drupal_alter('views_send_mail', $message, $params, $data, $views_send_token_data);
 
     if ($params['views_send_direct']) {
       $operations[] = array('views_send_batch_deliver', array($message, $plain_format, $attachments));