I too hope Modest replaces the default mail client in Diablo. That and in-place firmware upgrades would make it a must-have for me. It'll be nice not to have to restore from back-up all the time....