#205 Improved recipient verification and focus handling