Applying the checking then unchecking fix to move email method.