Merge "fix crasher on pre-v19" into ub-mail-master