From fc1bfe043bc2e0b961b2c4ef81a20ddf3c54934b Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 23 Sep 2017 23:15:04 +0000
Subject: [PATCH] The "else" case was only confusing

---
 include/onepoll.php | 58 +++++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 34 deletions(-)

diff --git a/include/onepoll.php b/include/onepoll.php
index 61de852be9..91f517bdeb 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -498,46 +498,36 @@ function onepoll_run(&$argv, &$argc){
 
 						logger("Mail: Importing ".$msg_uid." for ".$mailconf[0]['user']);
 
-						// some mailing lists have the original author as 'from' - add this sender info to msg body.
 						/// @TODO Adding a gravatar for the original author would be cool
 
-						if (! stristr($meta->from,$contact['addr'])) {
-							$from = imap_mime_header_decode($meta->from);
-							$fromdecoded = "";
-							foreach ($from as $frompart) {
-								if ($frompart->charset != "default") {
-									$fromdecoded .= iconv($frompart->charset, 'UTF-8//IGNORE', $frompart->text);
-								} else {
-									$fromdecoded .= $frompart->text;
-								}
-							}
-
-							$fromarr = imap_rfc822_parse_adrlist($fromdecoded, $a->get_hostname());
-
-							$frommail = $fromarr[0]->mailbox."@".$fromarr[0]->host;
-
-							if (isset($fromarr[0]->personal)) {
-								$fromname = $fromarr[0]->personal;
+						$from = imap_mime_header_decode($meta->from);
+						$fromdecoded = "";
+						foreach ($from as $frompart) {
+							if ($frompart->charset != "default") {
+								$fromdecoded .= iconv($frompart->charset, 'UTF-8//IGNORE', $frompart->text);
 							} else {
-								$fromname = $frommail;
+								$fromdecoded .= $frompart->text;
 							}
-
-							//$datarray['body'] = "[b]".t('From: ') . escape_tags($fromdecoded) . "[/b]\n\n" . $datarray['body'];
-
-							$datarray['author-name'] = $fromname;
-							$datarray['author-link'] = "mailto:".$frommail;
-							$datarray['author-avatar'] = $contact['photo'];
-
-							$datarray['owner-name'] = $contact['name'];
-							$datarray['owner-link'] = "mailto:".$contact['addr'];
-							$datarray['owner-avatar'] = $contact['photo'];
-
-						} else {
-							$datarray['author-name'] = $contact['name'];
-							$datarray['author-link'] = 'mailbox';
-							$datarray['author-avatar'] = $contact['photo'];
 						}
 
+						$fromarr = imap_rfc822_parse_adrlist($fromdecoded, $a->get_hostname());
+
+						$frommail = $fromarr[0]->mailbox."@".$fromarr[0]->host;
+
+						if (isset($fromarr[0]->personal)) {
+							$fromname = $fromarr[0]->personal;
+						} else {
+							$fromname = $frommail;
+						}
+
+						$datarray['author-name'] = $fromname;
+						$datarray['author-link'] = "mailto:".$frommail;
+						$datarray['author-avatar'] = $contact['photo'];
+
+						$datarray['owner-name'] = $contact['name'];
+						$datarray['owner-link'] = "mailto:".$contact['addr'];
+						$datarray['owner-avatar'] = $contact['photo'];
+
 						$datarray['uid'] = $importer_uid;
 						$datarray['contact-id'] = $contact['id'];
 						if ($datarray['parent-uri'] === $datarray['uri'])