Merge pull request #1071 from tpikonen/narrow-channel-dialog