diff --git a/app/src/main/java/eu/faircode/email/EditTextMultiAutoComplete.java b/app/src/main/java/eu/faircode/email/EditTextMultiAutoComplete.java index b5a8d2ef3f..5042250c6a 100644 --- a/app/src/main/java/eu/faircode/email/EditTextMultiAutoComplete.java +++ b/app/src/main/java/eu/faircode/email/EditTextMultiAutoComplete.java @@ -600,6 +600,10 @@ public class EditTextMultiAutoComplete extends AppCompatMultiAutoCompleteTextVie int sourceStart = state.start; int sourceEnd = state.tokenEnd; + + if (sourceStart > state.source.length() || sourceEnd > state.source.length()) + return true; + if (this == state.source && target >= sourceStart && target <= sourceEnd) return true;