Merge branch 'km/send-email-compose-encoding'