diff --git a/framework/Mime/lib/Horde/Mime.php b/framework/Mime/lib/Horde/Mime.php
index 0457e3c0724..6698985c289 100644
--- a/framework/Mime/lib/Horde/Mime.php
+++ b/framework/Mime/lib/Horde/Mime.php
@@ -283,12 +283,11 @@ public static function decode($string)
     /* Deprecated methods. */
 
     /**
-     * @deprecated  Use Horde_Mime_Headers#generateMessageId() instead.
+     * @deprecated  Use Horde_Mime_Headers_MessageId::create() instead.
      */
     public static function generateMessageId()
     {
-        $hdr = new Horde_Mime_Headers();
-        return $hdr->generateMessageId();
+        return Horde_Mime_Headers_MessageId::create()->value;
     }
 
     /**
diff --git a/framework/Mime/package.xml b/framework/Mime/package.xml
index dbe732b4aee..21baf32d460 100644
--- a/framework/Mime/package.xml
+++ b/framework/Mime/package.xml
@@ -28,6 +28,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
+* [mms] Fix regression in using the deprecated Horde_Mime::generateMessageId() method (Bug #13846).
 * [mms] Add Horde_Mime_Headers_ContentId class.
 * [mms] Add Horde_Mime_Headers_ContentTransferEncoding class.
 * [mms] Added Horde_Mime_Headers_Element#isDefault().
@@ -1657,6 +1658,7 @@
    <date>2015-01-22</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
+* [mms] Fix regression in using the deprecated Horde_Mime::generateMessageId() method (Bug #13846).
 * [mms] Add Horde_Mime_Headers_ContentId class.
 * [mms] Add Horde_Mime_Headers_ContentTransferEncoding class.
 * [mms] Added Horde_Mime_Headers_Element#isDefault().