diff --git a/scripts/messenger.js b/scripts/messenger.js
index abef6da..94b3e94 100644
--- a/scripts/messenger.js
+++ b/scripts/messenger.js
@@ -342,6 +342,18 @@ class Messenger {
 
                                 if (m.blob_attachments) {
                                     obj.attachment = m.blob_attachments[0];
+
+                                    if (obj.body == "" && m.blob_attachments[0]) {
+                                        if (m.blob_attachments[0].__typename === "MessageImage") {
+                                          obj.body = 'sent an image ';
+                                        } else if (m.blob_attachments[0].__typename === "MessageAnimatedImage") {
+                                          obj.body = 'sent a gif ';
+                                        }
+                                    }
+                                }
+                                if (m.sticker) {
+                                    obj.body += 'sent a sticker: ' + m.sticker.label + ' ';
+                                    obj.attachment = m.sticker;
                                 }
                                 data.push(obj);
                             }
diff --git a/scripts/pull.js b/scripts/pull.js
index 3fe2c07..3542bf2 100644
--- a/scripts/pull.js
+++ b/scripts/pull.js
@@ -116,6 +116,18 @@ class Pull extends EventEmitter {
                                             });
                                         } else if (ms.delta.attachments !== undefined) {
                                             const att = ms.delta.attachments[0];
+                                            if (att.mercury.sticker_attachment !== undefined) {
+                                                this.emit('message', {
+                                                    type: 'msg',
+                                                    author: ms.delta.messageMetadata.actorFbId,
+                                                    body: 'sent a sticker: ' + att.mercury.sticker_attachment.label + ' ',
+                                                    otherUserId: ms.delta.messageMetadata.threadKey.otherUserFbId,
+                                                    threadId: ms.delta.messageMetadata.threadKey.threadFbId,
+                                                    timestamp: ms.delta.messageMetadata.timestamp,
+                                                    attachment: att.mercury.sticker_attachment
+                                                });
+                                            }
+                                            
                                             if (att.mercury.attach_type === 'animated_image') {
                                                 this.emit('message', {
                                                     type: 'msg',
@@ -153,6 +165,26 @@ class Pull extends EventEmitter {
                                                         });
                                                     }
                                                 }
+                                            } else if (att.mercury.blob_attachment.__typename === 'MessageImage') {
+                                                this.emit('message', {
+                                                    type: 'msg',
+                                                    author: ms.delta.messageMetadata.actorFbId,
+                                                    body: 'sent an image ',
+                                                    otherUserId: ms.delta.messageMetadata.threadKey.otherUserFbId,
+                                                    threadId: ms.delta.messageMetadata.threadKey.threadFbId,
+                                                    timestamp: ms.delta.messageMetadata.timestamp,
+                                                    attachment: att.mercury.blob_attachment
+                                                });
+                                            } else if (att.mercury.blob_attachment.__typename === 'MessageAnimatedImage') {
+                                                this.emit('message', {
+                                                    type: 'msg',
+                                                    author: ms.delta.messageMetadata.actorFbId,
+                                                    body: 'sent a gif ',
+                                                    otherUserId: ms.delta.messageMetadata.threadKey.otherUserFbId,
+                                                    threadId: ms.delta.messageMetadata.threadKey.threadFbId,
+                                                    timestamp: ms.delta.messageMetadata.timestamp,
+                                                    attachment: att.mercury.blob_attachment
+                                                });
                                             }
                                         }
                                     } else if (ms.delta.class === 'AdminTextMessage') {