diff --git a/src/event/server_events.c b/src/event/server_events.c
index 81ce3927..66ee65a9 100644
--- a/src/event/server_events.c
+++ b/src/event/server_events.c
@@ -471,6 +471,8 @@ sv_ev_outgoing_carbon(ProfMessage* message)
 
     if (message->enc == PROF_MSG_ENC_OMEMO) {
         chatwin_outgoing_carbon(chatwin, message);
+    } else if (message->enc == PROF_MSG_ENC_OX) {
+        chatwin_outgoing_carbon(chatwin, message);
     } else if (message->encrypted) {
 #ifdef HAVE_LIBGPGME
         message->plain = p_gpg_decrypt(message->encrypted);
diff --git a/src/ui/chatwin.c b/src/ui/chatwin.c
index d462f08a..c1ecd705 100644
--- a/src/ui/chatwin.c
+++ b/src/ui/chatwin.c
@@ -467,6 +467,8 @@ chatwin_outgoing_carbon(ProfChatWin* chatwin, ProfMessage* message)
         enc_char = prefs_get_pgp_char();
     } else if (message->enc == PROF_MSG_ENC_OMEMO) {
         enc_char = prefs_get_omemo_char();
+    } else if (message->enc == PROF_MSG_ENC_OX) {
+        enc_char = prefs_get_ox_char();
     } else {
         enc_char = strdup("-");
     }