From 09e399a060f921e3db60b2d3d7b2f9178ae701a6 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 18 Jul 2016 20:05:29 -0600
Subject: [PATCH] Messages Cut Off #73

---
 core/ftn_mail_packet.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/ftn_mail_packet.js b/core/ftn_mail_packet.js
index 308130c4..7fe7a195 100644
--- a/core/ftn_mail_packet.js
+++ b/core/ftn_mail_packet.js
@@ -478,8 +478,8 @@ function Packet(options) {
 						decoded = iconv.decode(messageBodyBuffer, 'ascii');
 					}
 					//const messageLines = iconv.decode(messageBodyBuffer, encoding).replace(/\xec/g, '').split(/\r\n|[\n\v\f\r\x85\u2028\u2029]/g);
-					const messageLines = decoded.replace(/\xec/g, '').split(/\r\n|[\n\v\f\r\x85\u2028\u2029]/g);
-					let endOfMessage = true;
+					const messageLines	= decoded.replace(/\xec/g, '').split(/\r\n|[\n\v\f\r\x85\u2028\u2029]/g);
+					let endOfMessage	= false;
 
 					messageLines.forEach(line => {
 						if(0 === line.length) {
@@ -492,9 +492,9 @@ function Packet(options) {
 						} else if(line.startsWith('--- ')) {
 							//	Tear Lines are tracked allowing for specialized display/etc.
 							messageBodyData.tearLine = line;
-						} else if(/[ ]{1,2}(\* )?Origin\: /.test(line)) {	//	To spec is " * Origin: ..."
+						} else if(/^[ ]{1,2}\* Origin\: /.test(line)) {	//	To spec is " * Origin: ..."
 							messageBodyData.originLine = line;
-							endOfMessage = false;	//	Anything past origin is not part of the message body
+							endOfMessage = true;	//	Anything past origin is not part of the message body
 						} else if(line.startsWith('SEEN-BY:')) {
 							endOfMessage = true;	//	Anything past the first SEEN-BY is not part of the message body
 							messageBodyData.seenBy.push(line.substring(line.indexOf(':') + 1).trim());
@@ -503,18 +503,18 @@ function Packet(options) {
 								endOfMessage = true;	//	Anything pats the first PATH is not part of the message body
 							}
 							addKludgeLine(line.slice(1));
-						} else if(endOfMessage) {
+						} else if(!endOfMessage) {
 							//	regular ol' message line
 							messageBodyData.message.push(line);
 						}
 					});
 
-					callback(null);
+					return callback(null);
 				}
 			],
-			function complete(err) {
+			() => {
 				messageBodyData.message = messageBodyData.message.join('\n');
-				cb(messageBodyData);
+				return cb(messageBodyData);
 			}
 		);
 	};