diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f377284508d403171c9b01be082ed4b6ea492060..990de4d6e878ef2a82f483f53c1e454d7c2bb5a8 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -2,7 +2,7 @@
 PHPMailer 7.x-3.x, xxxx-xx-xx
 -----------------------------
 #927646 by oadaeh: Fixed Bogus case of Cc and Bcc mail header fields.
-#811774 by InternetDevels.Com, sun: Fixed MimeMail integration.
+#811774 by InternetDevels.Com, sun, Kars-T: Fixed MimeMail integration.
 #811774 by sun: Fixed duplicate disabled warning when submitting settings form.
 #1188610 by sun: Fixed bogus variable $mail in exception handling.
 #1183836 by sun: Fixed more verbose log messages required in case of an error.
diff --git a/phpmailer.module b/phpmailer.module
index 814b57a4c9fd854953b2cd892da846c1ecee5c32..9c2785fcd2d9146e04e327af6b19cbac15e0c390 100644
--- a/phpmailer.module
+++ b/phpmailer.module
@@ -79,11 +79,11 @@ function phpmailer_mailengine($op, $message = array()) {
   }
 
   switch ($op) {
-    case 'name':
-      return t('PHPMailer');
-
-    case 'description':
-      return t('Mailing engine using the PHPMailer library.');
+    case 'list':
+      return array(
+        'name' => t('PHPMailer'),
+        'description' => t('Mailing engine using the PHPMailer library.'),
+      );
 
     case 'settings':
       $form['info']['#value'] = t('To configure your mail server settings, visit the <a href="@url">PHPMailer settings page</a>.', array('@url' => url('admin/config/system/phpmailer')));
@@ -217,7 +217,7 @@ function phpmailer_registry_files_alter(&$files, $modules) {
   if (!$library_path) {
     return;
   }
-  foreach (array('class.phpmailer.php', 'class.pop3.php', 'class.smtp.php') as $filename) {
+  foreach (array('class.phpmailer.php', 'class.smtp.php') as $filename) {
     $files[$library_path . '/' . $filename] = array(
       'module' => 'phpmailer',
       'weight' => 0,
@@ -226,15 +226,17 @@ function phpmailer_registry_files_alter(&$files, $modules) {
 }
 
 /**
- * Returns whether PHPMailer library files exist.
+ * Verify that PHPMailer libraries exist.
  */
 function phpmailer_library_exists() {
-  $exists = FALSE;
   $library_path = libraries_get_path('phpmailer');
-  if ($library_path) {
-    foreach (array('class.phpmailer.php', 'class.pop3.php', 'class.smtp.php') as $filename) {
-      $exists = ($exists && file_exists(DRUPAL_ROOT . '/' . $library_path . '/' . $filename));
+  if (!$library_path) {
+    return FALSE;
+  }
+  foreach (array('class.phpmailer.php', 'class.smtp.php') as $filename) {
+    if (!file_exists(DRUPAL_ROOT . '/' . $library_path . '/' . $filename)) {
+      return FALSE;
     }
   }
-  return $exists;
+  return TRUE;
 }