Per comments in PR #473 https://github.com/k9mail/k-9/pull/474#commitcomment-7416979 https://github.com/k9mail/k-9/pull/474#commitcomment-7416999