diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceipt.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceipt.java
index 6b239da84..87169dbe0 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceipt.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceipt.java
@@ -19,7 +19,7 @@ package org.jivesoftware.smackx.receipts;
 import java.util.List;
 import java.util.Map;
 
-import org.jivesoftware.smack.packet.Stanza;
+import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.provider.EmbeddedExtensionProvider;
 import org.jivesoftware.smack.util.XmlStringBuilder;
@@ -76,21 +76,21 @@ public class DeliveryReceipt implements ExtensionElement
      *
      * @param p the packet
      * @return the {@link DeliveryReceipt} extension or {@code null}
-     * @deprecated use {@link #from(Stanza)} instead
+     * @deprecated use {@link #from(Message)} instead
      */
     @Deprecated
-    public static DeliveryReceipt getFrom(Stanza p) {
+    public static DeliveryReceipt getFrom(Message p) {
         return from(p);
     }
 
     /**
-     * Get the {@link DeliveryReceipt} extension of the packet, if any.
+     * Get the {@link DeliveryReceipt} extension of the message, if any.
      *
-     * @param packet the packet
+     * @param message the message.
      * @return the {@link DeliveryReceipt} extension or {@code null}
      */
-    public static DeliveryReceipt from(Stanza packet) {
-        return packet.getExtension(ELEMENT, NAMESPACE);
+    public static DeliveryReceipt from(Message message) {
+        return message.getExtension(ELEMENT, NAMESPACE);
     }
 
     /**
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java
index 946696b1a..3e0531ffc 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java
@@ -130,7 +130,7 @@ public class DeliveryReceiptManager extends Manager {
         connection.addAsyncStanzaListener(new StanzaListener() {
             @Override
             public void processPacket(Stanza packet) throws NotConnectedException {
-                DeliveryReceipt dr = DeliveryReceipt.from(packet);
+                DeliveryReceipt dr = DeliveryReceipt.from((Message) packet);
                 // notify listeners of incoming receipt
                 for (ReceiptReceivedListener l : receiptReceivedListeners) {
                     l.onReceiptReceived(packet.getFrom(), packet.getTo(), dr.getId(), packet);
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
index 7f30b9d5d..fe20e40c3 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
@@ -115,7 +115,7 @@ public class DeliveryReceiptTest extends InitExtensions {
         c.processPacket(m);
 
         Stanza reply = c.getSentPacket();
-        DeliveryReceipt r = DeliveryReceipt.from(reply);
+        DeliveryReceipt r = DeliveryReceipt.from((Message) reply);
         assertEquals("romeo@montague.com", reply.getTo());
         assertEquals("test-receipt-request", r.getId());
     }