commit 165cf49e3bbc0a69e2496a04ae016daa95eee526
Author: Joel Pittet <joel@pittet.ca>
Date:   Wed Jun 24 21:58:53 2015 -0700

    new plan

diff --git a/modules/mimemail_compress/mimemail_compress.module b/modules/mimemail_compress/mimemail_compress.module
index d2d93bd..b91a9b3 100644
--- a/modules/mimemail_compress/mimemail_compress.module
+++ b/modules/mimemail_compress/mimemail_compress.module
@@ -9,19 +9,23 @@
  * Implements mail_post_process().
  */
 function mimemail_compress_mail_post_process(&$message, $mailkey) {
-  // If the emogrifier module is enabled use it instead.
-  if (module_exists('emogrifier')) {
-    $message = _emogrifier_process($message);
-    return;
-  }
-
   module_load_include('inc', 'mimemail_compress');
   // Separate CSS from HTML for processing.
   $parts = mimemail_compress_clean_message($message);
   // Compress HTML and CSS into combined message.
-  if (!empty($parts)) {
-    $output = new mimemail_compress($parts['html'], $parts['css']);
-    $output = $output->compress();
+  if ($message && !empty($parts)) {
+
+    // If the emogrifier module is enabled use it instead.
+    if (module_exists('emogrifier') && _emogrifier_available()) {
+      $emogrifier = new \Pelago\Emogrifier($parts['html'], $parts['css']);
+      // Apply the rules to create inline style attributes.
+      $output = @$emogrifier->emogrify();
+    }
+    else {
+      $output = new mimemail_compress($parts['html'], $parts['css']);
+      $output = $output->compress();
+    }
+
     $message = $output;
   }
 }