fix complete mail bugs