From e7892df10d6892c275e8da84eccbaa8beb555dd3 Mon Sep 17 00:00:00 2001
From: Pilou <pierre-louis@libregerbil.fr>
Date: Tue, 27 Apr 2021 15:43:31 +0200
Subject: [PATCH] FIX: handle charset=windows-1252 in mbox import script
 (#12832)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Loïc Dachary <loic@dachary.org>
---
 script/import_scripts/mbox/support/indexer.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/script/import_scripts/mbox/support/indexer.rb b/script/import_scripts/mbox/support/indexer.rb
index dc6e092c294..47ce3ed1334 100644
--- a/script/import_scripts/mbox/support/indexer.rb
+++ b/script/import_scripts/mbox/support/indexer.rb
@@ -160,9 +160,7 @@ module ImportScripts::Mbox
       last_line_number = 0
 
       each_line(filename) do |line|
-        line = line.scrub
-
-        if line =~ @split_regex
+        if line.scrub =~ @split_regex
           if last_line_number > 0
             yield raw_message, first_line_number, last_line_number
             raw_message = +''