diff --git a/src/ui/buffer.c b/src/ui/buffer.c
index f000746e..54178632 100644
--- a/src/ui/buffer.c
+++ b/src/ui/buffer.c
@@ -81,7 +81,7 @@ buffer_free(ProfBuff buffer)
 }
 
 void
-buffer_append(ProfBuff buffer, const char *show_char, int pad_indent, GDateTime *time, int flags, theme_item_t theme_item, const char *const display_from, const char *const barejid, const char *const message, DeliveryReceipt *receipt, const char *const id)
+buffer_append(ProfBuff buffer, const char *show_char, int pad_indent, GDateTime *time, int flags, theme_item_t theme_item, const char *const display_from, const char *const from_jid, const char *const message, DeliveryReceipt *receipt, const char *const id)
 {
     ProfBuffEntry *e = malloc(sizeof(struct prof_buff_entry_t));
     e->show_char = strdup(show_char);
@@ -90,7 +90,7 @@ buffer_append(ProfBuff buffer, const char *show_char, int pad_indent, GDateTime
     e->theme_item = theme_item;
     e->time = g_date_time_ref(time);
     e->display_from = display_from ? strdup(display_from) : NULL;
-    e->barejid = barejid ? strdup(barejid) : NULL;
+    e->from_jid = from_jid ? strdup(from_jid) : NULL;
     e->message = strdup(message);
     e->receipt = receipt;
     if (id) {
@@ -168,7 +168,7 @@ _free_entry(ProfBuffEntry *entry)
     free(entry->show_char);
     free(entry->message);
     free(entry->display_from);
-    free(entry->barejid);
+    free(entry->from_jid);
     free(entry->id);
     free(entry->receipt);
     g_date_time_unref(entry->time);
diff --git a/src/ui/buffer.h b/src/ui/buffer.h
index 8cc6610e..997e2a49 100644
--- a/src/ui/buffer.h
+++ b/src/ui/buffer.h
@@ -56,7 +56,7 @@ typedef struct prof_buff_entry_t {
     // from as it is displayed
     // might be nick, jid..
     char *display_from;
-    char *barejid;
+    char *from_jid;
     char *message;
     DeliveryReceipt *receipt;
     // message id, in case we have it
diff --git a/src/ui/window.c b/src/ui/window.c
index 0954ca35..1a7cfc21 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -1071,9 +1071,9 @@ _win_correct(ProfWin *window, const char *const message, const char *const id, c
         return;
     }
 
-    if (g_strcmp0(entry->barejid, from_jid) != 0) {
-        log_debug("Illicit LMC attempt from %s for message from %s with: %s", from_jid, entry->barejid, message);
-        cons_show("Illicit LMC attempt from %s for message from %s", from_jid, entry->barejid);
+    if (g_strcmp0(entry->from_jid, from_jid) != 0) {
+        log_debug("Illicit LMC attempt from %s for message from %s with: %s", from_jid, entry->from_jid, message);
+        cons_show("Illicit LMC attempt from %s for message from %s", from_jid, entry->from_jid);
         return;
     }