Fixing problem with message sender