No, AM is the best I've found, despite the odd challenge from time to time.
I've tried Fairemail, which is really excellent, and the interface can be made to look very much like how I have AM configured, however, Fairemail does have some limitations that don't work for my needs.
I've also tried others, including Nine, K9, Outlook, but none hit the mark for me like AM.
Unfortunately, this latest issue may be the catalyst for finding an acceptable replacement.