diff --git a/lib/mailin.js b/lib/mailin.js
index 65aba95..c1b4a64 100644
--- a/lib/mailin.js
+++ b/lib/mailin.js
@@ -430,13 +430,17 @@ Mailin.prototype.start = function (options, callback) {
 
         _this.emit('startMessage', connection);
 
-        stream.pipe(fs.createWriteStream(mailPath));
+        var destStream = stream.pipe(fs.createWriteStream(mailPath));
 
         stream.on('data', function (chunk) {
             _this.emit('data', connection, chunk);
         });
 
         stream.on('end', function () {
+            _this.emit('end', connection);
+        });
+
+        destStream.on('finish', function () {
             dataReady(connection);
             callback();
         });