Keyboard Shortcuts collide with normal key combinations

The new shortcuts for headings (i.e. Ctrl-Alt-2) collide with normal key combinations on Swiss German keyboards (and probably other keyboards) in a very annoying way. E.g. the @-sign is entered on a Swiss German keyboard by pressing AltGr-2, which corresponds to Ctrl-Alt-2. So every time I want to enter an @ in the rich text editor, the current paragraph is converted to a heading 2. The only way to enter an @ at the moment is to change to the wiki markup editor.