diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoMessage.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoMessage.java
index e4d2f1bc3..0883407f3 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoMessage.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoMessage.java
@@ -127,8 +127,7 @@ public class OmemoMessage {
          */
         public Message asMessage(Jid recipient) {
 
-            Message messageStanza = new Message();
-            messageStanza.setTo(recipient);
+            Message messageStanza = new Message(recipient, Message.Type.chat);
             messageStanza.addExtension(getElement());
 
             if (OmemoConfiguration.getAddOmemoHintBody()) {