1 files changed, 10 insertions, 0 deletions
diff --git a/src/ui/chatwin.c b/src/ui/chatwin.c
index 5064b194..8e17df8e 100644
--- a/src/ui/chatwin.c
+++ b/src/ui/chatwin.c
@@ -50,6 +50,9 @@
 #ifdef HAVE_LIBOTR
 #include "otr/otr.h"
 #endif
+#ifdef HAVE_OMEMO
+#include "omemo/omemo.h"
+#endif
 
 static void _chatwin_history(ProfChatWin *chatwin, const char *const contact);
 
@@ -73,6 +76,13 @@ chatwin_new(const char *const barejid)
         }
     }
 
+#ifdef HAVE_OMEMO
+    if (omemo_automatic_start(barejid)) {
+        omemo_start_session(barejid);
+        chatwin->is_omemo = TRUE;
+    }
+#endif
+
     return chatwin;
 }