diff --git a/lib/smstools-handler/received.js b/lib/smstools-handler/received.js
index c9bea56..ef1468c 100644
--- a/lib/smstools-handler/received.js
+++ b/lib/smstools-handler/received.js
@@ -10,19 +10,20 @@ messagingClient.setTransport(transport);
 
 const mailparser = require('../mailparser-wrapper');
 
+const eventType = 'RECEIVED';
 
 module.exports = async (msgFilename) => {
     const msg = await fs.promises.readFile(msgFilename);
 
     if (!msg) {
-        logger.warn('Can not read message file', { msgFile: msgFilename });
+        logger.warn('Can not read message file', { eventType, msgFile: msgFilename });
         return;
     }
 
     const parsedMsg = await mailparser(msg);
 
     if (!parsedMsg || !parsedMsg.headers) {
-        logger.warn('Invalid message');
+        logger.warn('Invalid message', { eventType, msgFile: msgFilename, msgFileContent: msg });
         return;
     }
 
@@ -34,7 +35,12 @@ module.exports = async (msgFilename) => {
     const sent = sentRaw && moment(sentRaw, 'YY-MM-DD HH:mm:ss');
 
     logger.info('Message parsed', {
-        from, imsi, text, sent,
+        eventType,
+        msgFile: msgFilename,
+        from,
+        imsi,
+        text,
+        sent,
     });
 
     if (!from || !imsi || !text) {
@@ -45,7 +51,13 @@ module.exports = async (msgFilename) => {
         const messageAgeMs = new Date() - sent;
         if (messageAgeMs > 5 * 60 * 1000) {
             logger.info('Ignore expired message', {
-                imsi, from, text, sent, messageAgeMs,
+                eventType,
+                msgFile: msgFilename,
+                imsi,
+                from,
+                text,
+                sent,
+                messageAgeMs,
             });
             return;
         }