Merge branch 'fix-r-shortcut' into 'master'

Restore "r" shortcut

Fixes "Reply with Selected Text" shortcut

See merge request !4041