3 files changed, 18 insertions, 7 deletions
diff --git a/protocols/jabber/conference.c b/protocols/jabber/conference.c
index 593e4233..75f3100c 100644
--- a/protocols/jabber/conference.c
+++ b/protocols/jabber/conference.c
@@ -166,6 +166,7 @@ void jabber_chat_free(struct groupchat *c)
 
 	jabber_buddy_remove_bare(c->ic, jc->name);
 
+	g_free(jc->last_sent_message);
 	g_free(jc->my_full_jid);
 	g_free(jc->name);
 	g_free(jc->invite);
@@ -187,6 +188,9 @@ int jabber_chat_msg(struct groupchat *c, char *message, int flags)
 
 	jabber_cache_add(ic, node, jabber_chat_self_message);
 
+	g_free(jc->last_sent_message);
+	jc->last_sent_message = g_strdup(message);
+
 	return !jabber_write_packet(ic, node);
 }
 
@@ -493,10 +497,16 @@ void jabber_chat_pkt_message(struct im_connection *ic, struct jabber_buddy *bud,
 	} else if (chat != NULL && bud == NULL && nick == NULL) {
 		imcb_chat_log(chat, "From conference server: %s", body->text);
 		return;
-	} else if (jc && jc->flags & JCFLAG_MESSAGE_SENT && bud == jc->me &&
-		   (jabber_cache_handle_packet(ic, node) == XT_ABORT)) {
-		/* Self message marked by this bitlbee, don't show it */
-		return;
+	} else if (jc && jc->flags & JCFLAG_MESSAGE_SENT && bud == jc->me) {
+		if (jabber_cache_handle_packet(ic, node) == XT_ABORT) {
+			/* Self message marked by this bitlbee, don't show it */
+			return;
+		} else if (xt_find_attr(node, "id") == NULL &&
+		           g_strcmp0(body->text, jc->last_sent_message) == 0) {
+			/* Some misbehaving servers (like slack) eat the ids and echo anyway.
+			 * Try to detect those cases by comparing against the last sent message. */
+			return;
+		}
 	}
 
 	if (bud) {
diff --git a/protocols/jabber/jabber.h b/protocols/jabber/jabber.h
index a09bd060..5100b7a9 100644
--- a/protocols/jabber/jabber.h
+++ b/protocols/jabber/jabber.h
@@ -178,6 +178,7 @@ struct jabber_chat {
 	char *my_full_jid; /* Separate copy because of case sensitivity. */
 	struct jabber_buddy *me;
 	char *invite;
+	char *last_sent_message;
 };
 
 struct jabber_transfer {
diff --git a/protocols/jabber/s5bytestream.c b/protocols/jabber/s5bytestream.c
index 577840f1..9c79de8e 100644
--- a/protocols/jabber/s5bytestream.c
+++ b/protocols/jabber/s5bytestream.c
@@ -499,7 +499,7 @@ gboolean jabber_bs_recv_handshake(gpointer data, gint fd, b_input_condition cond
 	}
 	case BS_PHASE_REPLY:
 	{
-		struct socks5_message socks5_reply;
+		struct socks5_message socks5_reply = {0};
 		int ret;
 
 		if (!(ret = jabber_bs_peek(bt, &socks5_reply, sizeof(struct socks5_message)))) {
@@ -1045,7 +1045,7 @@ gboolean jabber_bs_send_handshake(gpointer data, gint fd, b_input_condition cond
 			unsigned char ver;
 			unsigned char nmethods;
 			unsigned char method;
-		} socks5_hello;
+		} socks5_hello = {0};
 
 		if (!(ret = jabber_bs_peek(bt, &socks5_hello, sizeof(socks5_hello)))) {
 			return FALSE;
@@ -1090,7 +1090,7 @@ gboolean jabber_bs_send_handshake(gpointer data, gint fd, b_input_condition cond
 	}
 	case BS_PHASE_REQUEST:
 	{
-		struct socks5_message socks5_connect;
+		struct socks5_message socks5_connect = {0};
 		int msgsize = sizeof(struct socks5_message);
 		int ret;