From 018d74f1f54847bd86d0a90bc30fcd74d5f06b0e Mon Sep 17 00:00:00 2001
From: Sebastian <basti@notizbuch>
Date: Tue, 12 Aug 2014 00:56:25 +0200
Subject: [PATCH] FTNMAIL: encode all strings equally

---
 modules/FTNMAIL.pm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/FTNMAIL.pm b/modules/FTNMAIL.pm
index 05eeaa9..8a606af 100644
--- a/modules/FTNMAIL.pm
+++ b/modules/FTNMAIL.pm
@@ -23,10 +23,12 @@ sub pack_mail($$)
 	my ($mail, $charset) = @_;
 	my $output;
 
-	# encode subject/body correctly
-	my $chrs = charset2chrs($charset) or return(undef);
-	my $subj = encode($charset, $mail->{subj});
-	my $body = encode($charset, $mail->{body});
+	# encode all strings correctly
+	my $chrs  = charset2chrs($charset) or return(undef);
+	my $fname = encode($charset, $mail->{fname});
+	my $tname = encode($charset, $mail->{tname});
+	my $subj  = encode($charset, $mail->{subj});
+	my $body  = encode($charset, $mail->{body});
 	$body    =~ s/\n/\x0D/g;
 
 	# generate kludge lines
@@ -80,7 +82,7 @@ sub pack_mail($$)
 		0,				# Attribute
 		0,				# Cost
 		$datetime,			# Date/Time String
-		$mail->{tname}, $mail->{fname},	# From/To
+		$tname, $fname,			# From/To
 		$subj, $output			# Subject/Body
 	);
 	return($pack);
@@ -150,7 +152,7 @@ sub unpack_body($$$$)
 
 	# find FROM and TO addresses
 	if(!$mail{area}) {
-	# --> NETMAIL: use INTL/FMPT/TOPT
+	# --> NETMAIL: use INTL/FMPT/TOPT (fallback to packet headers)
 		if($intl && $intl=~/^(\d+):(\d+)\/(\d+) (\d+):(\d+)\/(\d+)$/) {
 			if($fmpt) {
 				$mail{from} = "$4:$5/$6.$fmpt";
-- 
2.30.2