diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index d09238f4f7d..8439221ce7c 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -907,6 +907,8 @@ class AccountMoveLine(models.Model):
             vals['date'] = self._context.get('date_p') or time.strftime('%Y-%m-%d')
         if 'name' not in vals:
             vals['name'] = self._context.get('comment') or _('Write-Off')
+        if 'analytic_account_id' not in vals:
+            vals['analytic_account_id'] = self.env.context.get('analytic_id', False)
         #compute the writeoff amount if not given
         if 'credit' not in vals and 'debit' not in vals:
             amount = sum([r.amount_residual for r in self])
diff --git a/addons/l10n_ar/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_ar/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
similarity index 100%
rename from addons/l10n_ar/migrations/2.0/post-migrate_tags_on_taxes.py
rename to addons/l10n_ar/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
diff --git a/addons/l10n_at/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_at/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
similarity index 100%
rename from addons/l10n_at/migrations/2.0/post-migrate_tags_on_taxes.py
rename to addons/l10n_at/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
diff --git a/addons/l10n_at/migrations/2.0/pre-set_tags_and_taxes_updatable.py b/addons/l10n_at/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py
similarity index 100%
rename from addons/l10n_at/migrations/2.0/pre-set_tags_and_taxes_updatable.py
rename to addons/l10n_at/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py
diff --git a/addons/l10n_bo/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_bo/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
similarity index 100%
rename from addons/l10n_bo/migrations/2.0/post-migrate_tags_on_taxes.py
rename to addons/l10n_bo/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
diff --git a/addons/l10n_br/migrations/1.0/post-migrate_tags_on_taxes.py b/addons/l10n_br/migrations/9.0.1.0/post-migrate_tags_on_taxes.py
similarity index 100%
rename from addons/l10n_br/migrations/1.0/post-migrate_tags_on_taxes.py
rename to addons/l10n_br/migrations/9.0.1.0/post-migrate_tags_on_taxes.py
diff --git a/addons/l10n_ch/migrations/9.0/post-migrate_tags_on_taxes.py b/addons/l10n_ch/migrations/9.0.9.0/post-migrate_tags_on_taxes.py
similarity index 100%
rename from addons/l10n_ch/migrations/9.0/post-migrate_tags_on_taxes.py
rename to addons/l10n_ch/migrations/9.0.9.0/post-migrate_tags_on_taxes.py
diff --git a/addons/l10n_ch/migrations/9.0/pre-set_tags_and_taxes_updatable.py b/addons/l10n_ch/migrations/9.0.9.0/pre-set_tags_and_taxes_updatable.py
similarity index 100%
rename from addons/l10n_ch/migrations/9.0/pre-set_tags_and_taxes_updatable.py
rename to addons/l10n_ch/migrations/9.0.9.0/pre-set_tags_and_taxes_updatable.py
diff --git a/addons/l10n_cl/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_cl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
similarity index 100%
rename from addons/l10n_cl/migrations/2.0/post-migrate_tags_on_taxes.py
rename to addons/l10n_cl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
diff --git a/addons/l10n_cl/migrations/2.0/pre-set_tags_and_taxes_updatable.py b/addons/l10n_cl/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py
similarity index 100%
rename from addons/l10n_cl/migrations/2.0/pre-set_tags_and_taxes_updatable.py
rename to addons/l10n_cl/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py
diff --git a/addons/l10n_de_skr03/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_de_skr03/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
similarity index 100%
rename from addons/l10n_de_skr03/migrations/2.0/post-migrate_tags_on_taxes.py
rename to addons/l10n_de_skr03/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
diff --git a/addons/l10n_de_skr03/migrations/2.0/pre-set_tags_and_taxes_updatable.py b/addons/l10n_de_skr03/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py
similarity index 100%
rename from addons/l10n_de_skr03/migrations/2.0/pre-set_tags_and_taxes_updatable.py
rename to addons/l10n_de_skr03/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py
diff --git a/addons/l10n_de_skr04/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_de_skr04/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
similarity index 100%
rename from addons/l10n_de_skr04/migrations/2.0/post-migrate_tags_on_taxes.py
rename to addons/l10n_de_skr04/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
diff --git a/addons/l10n_de_skr04/migrations/2.0/pre-set_tags_and_taxes_updatable.py b/addons/l10n_de_skr04/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py
similarity index 100%
rename from addons/l10n_de_skr04/migrations/2.0/pre-set_tags_and_taxes_updatable.py
rename to addons/l10n_de_skr04/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py
diff --git a/addons/l10n_et/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_et/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
similarity index 100%
rename from addons/l10n_et/migrations/2.0/post-migrate_tags_on_taxes.py
rename to addons/l10n_et/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
diff --git a/addons/l10n_gr/migrations/1.0/post-migrate_tags_on_taxes.py b/addons/l10n_gr/migrations/9.0.1.0/post-migrate_tags_on_taxes.py
similarity index 100%
rename from addons/l10n_gr/migrations/1.0/post-migrate_tags_on_taxes.py
rename to addons/l10n_gr/migrations/9.0.1.0/post-migrate_tags_on_taxes.py
diff --git a/addons/l10n_hr/migrations/13.0/post-migrate_tags_on_taxes.py b/addons/l10n_hr/migrations/9.0.13.0/post-migrate_tags_on_taxes.py
similarity index 100%
rename from addons/l10n_hr/migrations/13.0/post-migrate_tags_on_taxes.py
rename to addons/l10n_hr/migrations/9.0.13.0/post-migrate_tags_on_taxes.py
diff --git a/addons/l10n_hr/migrations/13.0/pre-set_tags_and_taxes_updatable.py b/addons/l10n_hr/migrations/9.0.13.0/pre-set_tags_and_taxes_updatable.py
similarity index 100%
rename from addons/l10n_hr/migrations/13.0/pre-set_tags_and_taxes_updatable.py
rename to addons/l10n_hr/migrations/9.0.13.0/pre-set_tags_and_taxes_updatable.py
diff --git a/addons/l10n_hu/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_hu/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
similarity index 100%
rename from addons/l10n_hu/migrations/2.0/post-migrate_tags_on_taxes.py
rename to addons/l10n_hu/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
diff --git a/addons/l10n_in/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_in/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
similarity index 100%
rename from addons/l10n_in/migrations/2.0/post-migrate_tags_on_taxes.py
rename to addons/l10n_in/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
diff --git a/addons/l10n_in/migrations/2.0/pre-set_tags_and_taxes_updatable.py b/addons/l10n_in/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py
similarity index 100%
rename from addons/l10n_in/migrations/2.0/pre-set_tags_and_taxes_updatable.py
rename to addons/l10n_in/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py
diff --git a/addons/l10n_jp/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_jp/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
similarity index 100%
rename from addons/l10n_jp/migrations/2.0/post-migrate_tags_on_taxes.py
rename to addons/l10n_jp/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
diff --git a/addons/l10n_nl/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_nl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
similarity index 100%
rename from addons/l10n_nl/migrations/2.0/post-migrate_tags_on_taxes.py
rename to addons/l10n_nl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
diff --git a/addons/l10n_nl/migrations/2.0/pre-set_tags_and_taxes_updatable.py b/addons/l10n_nl/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py
similarity index 100%
rename from addons/l10n_nl/migrations/2.0/pre-set_tags_and_taxes_updatable.py
rename to addons/l10n_nl/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py
diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py
index bf42a515220..7dd4780a0f0 100644
--- a/addons/mail/models/mail_thread.py
+++ b/addons/mail/models/mail_thread.py
@@ -1087,7 +1087,7 @@ class MailThread(models.AbstractModel):
                        decode_header(message, 'Cc'),
                        decode_header(message, 'Resent-To'),
                        decode_header(message, 'Resent-Cc')])
-        local_parts = [e.split('@')[0] for e in tools.email_split(rcpt_tos)]
+        local_parts = [e.split('@')[0].lower() for e in tools.email_split(rcpt_tos)]
         if local_parts:
             aliases = Alias.search([('alias_name', 'in', local_parts)])
             if aliases: