Merge branch 'dev'
Up/Down message edit selection is now blocked when a message has started to be typed.