Fixes bug with message subject selection