Re-worked how to/from/cc/bcc works