From 7585ac450e62c6d0d90439ee2197fab101bf2eda Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Wed, 30 Mar 2022 10:26:00 +0200
Subject: [PATCH] Cleanup Email.toLine()

---
 dev/Component/EmailAddresses.js | 2 +-
 dev/Model/Email.js              | 2 +-
 dev/View/Popup/Compose.js       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/Component/EmailAddresses.js b/dev/Component/EmailAddresses.js
index 50f55836e..2122918a1 100644
--- a/dev/Component/EmailAddresses.js
+++ b/dev/Component/EmailAddresses.js
@@ -148,7 +148,7 @@ export class EmailAddressesComponent {
 				hook = (v && [',', ';', '\n'].includes(v.slice(-1))) ? EmailModel.splitEmailLine(val) : null,
 				values = (hook || [val]).map(value => EmailModel.parseEmailLine(value))
 						.flat(Infinity)
-						.map(item => (item.toLine ? [item.toLine(false), item] : [item, null]));
+						.map(item => (item.toLine ? [item.toLine(), item] : [item, null]));
 
 			if (values.length) {
 				values.forEach(a => {
diff --git a/dev/Model/Email.js b/dev/Model/Email.js
index 02d0ea96a..6502e105e 100644
--- a/dev/Model/Email.js
+++ b/dev/Model/Email.js
@@ -388,7 +388,7 @@ export class EmailModel extends AbstractModel {
 					exists = true;
 				}
 
-				result.push(address ? address.toLine(false) : item.name);
+				result.push(address ? address.toLine() : item.name);
 			});
 
 			return exists ? result : null;
diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index 7aaf9645d..42dc915fd 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -693,7 +693,7 @@ export class ComposePopupView extends AbstractViewPopup {
 			(iError, data) => {
 				if (!iError && isArray(data.Result)) {
 					fResponse(
-						data.Result.map(item => (item && item[0] ? (new EmailModel(item[0], item[1])).toLine(false) : null))
+						data.Result.map(item => (item && item[0] ? (new EmailModel(item[0], item[1])).toLine() : null))
 						.filter(v => v)
 					);
 				} else if (Notification.RequestAborted !== iError) {
@@ -870,7 +870,7 @@ export class ComposePopupView extends AbstractViewPopup {
 	addEmailsTo(fKoValue, emails) {
 		if (arrayLength(emails)) {
 			const value = fKoValue().trim(),
-				values = emails.map(item => item ? item.toLine(false) : null)
+				values = emails.map(item => item ? item.toLine() : null)
 					.validUnique();
 
 			fKoValue(value + (value ? ', ' :  '') + values.join(', ').trim());