Avoids using iconv with '//IGNORE' flag if possible

Signed-off-by: Cyrille Bollu <cyr.debian@bollu.be>

1 files changed, 8 insertions, 1 deletions

diff --git a/lib/Model/IMAPMessage.php b/lib/Model/IMAPMessage.php
index ec97180d6..1841d1cb2 100644
--- a/lib/Model/IMAPMessage.php
+++ b/lib/Model/IMAPMessage.php
@@ -273,7 +273,14 @@ class IMAPMessage implements IMessage, JsonSerializable {
 	 * @return string
 	 */
 	public function getSubject(): string {
-		return iconv("UTF-8", "UTF-8//IGNORE", $this->getEnvelope()->subject);
+		// Try a soft conversion first (some installations, eg: Alpine linux,
+		// have issues with the '//IGNORE' option)
+		$subject = $this->getEnvelope()->subject;
+		$utf8 = iconv('UTF-8', 'UTF-8', $subject);
+		if ($utf8 !== false) {
+			return $utf8;
+		}
+		return iconv("UTF-8", "UTF-8//IGNORE", $subject);
 	}
 
 	/**