initial sender_locale support ... probably going to break stuff; also, patch from...