Fix issue 1896 (#1897)

* fix issue #1896

* Added issue to CHANGES.md

Author: deleolajide

CHANGES.md

@@ -2,14 +2,20 @@
 
 ## 6.0.1 (2020-02-13)
 
-- Bugfix. Handle stanza that clears the MUC subject
 - #1313: Stylistic improvements to the send button
 - #1793: Send button doesn't appear in Firefox in 1:1 chats
-- #1822: Don't log error if user has no bookmarks
 - #1820: Set focus on jid field after controlbox is loaded
+- #1822: Don't log error if user has no bookmarks
 - #1823: New config options [muc_roomid_policy](https://conversejs.org/docs/html/configuration.html#muc-roomid-policy)
     and [muc_roomid_policy_hint](https://conversejs.org/docs/html/configuration.html#muc-roomid-policy-hint)
 - #1826: A user can now add himself as a contact
+- #1839: Headline messages are shown in controlbox
+- #1896: Don't send receipts for messages fetched from the archive 
+- Bugfix. Handle stanza that clears the MUC subject
+- Allow ignore bootstrap modules at build using environment variable: BOOTSTRAP_IGNORE_MODULES="Modal,Dropdown".
+  example: export BOOTSTRAP_IGNORE_MODULES="Modal,Dropdown" && make dist
+- New config option [modtools_disable_query](https://conversejs.org/docs/html/configuration.html#modtools-disable-query)
+- New config option [modtools_disable_assign](https://conversejs.org/docs/html/configuration.html#modtools-disable-assign)
 
 ## 6.0.0 (2020-01-09)
 

src/headless/converse-chat.js

@@ -367,7 +367,7 @@ converse.plugins.add('converse-chat', {
                 if (message) {
                     this.updateMessage(message, original_stanza);
                 } else if (
-                    !this.handleReceipt (stanza, from_jid) &&
+                    !this.handleReceipt (stanza, original_stanza, from_jid) &&
                     !this.handleChatMarker(stanza, from_jid)
                 ) {
                     const attrs = await this.getMessageAttributesFromStanza(stanza, original_stanza);
@@ -774,10 +774,10 @@ converse.plugins.add('converse-chat', {
                 _converse.api.send(receipt_stanza);
             },
 
-            handleReceipt (stanza, from_jid) {
+            handleReceipt (stanza, original_stanza, from_jid) {
                 const is_me = Strophe.getBareJidFromJid(from_jid) === _converse.bare_jid;
                 const requests_receipt = sizzle(`request[xmlns="${Strophe.NS.RECEIPTS}"]`, stanza).pop() !== undefined;
-                if (requests_receipt && !is_me && !u.isCarbonMessage(stanza)) {
+                if (requests_receipt && !is_me && !u.isCarbonMessage(stanza) && !u.isMAMMessage(original_stanza)) {
                     this.sendReceiptStanza(from_jid, stanza.getAttribute('id'));
                 }
                 const to_bare_jid = Strophe.getBareJidFromJid(stanza.getAttribute('to'));