1 files changed, 3 insertions, 2 deletions
diff --git a/src/xmpp/capabilities.c b/src/xmpp/capabilities.c
index 17d60e36..6ca3a29e 100644
--- a/src/xmpp/capabilities.c
+++ b/src/xmpp/capabilities.c
@@ -105,8 +105,9 @@ caps_init(void)
     if (prefs_get_boolean(PREF_RECEIPTS_SEND)) {
         g_hash_table_add(prof_features, strdup(STANZA_NS_RECEIPTS));
     }
-    g_hash_table_add(prof_features, strdup(STANZA_NS_LASTACTIVITY));
-
+    if (prefs_get_boolean(PREF_LASTACTIVITY)) {
+        g_hash_table_add(prof_features, strdup(STANZA_NS_LASTACTIVITY));
+    }
     my_sha1 = NULL;
 }