rearrange code in commit message dialog (part of IDEA-96792) [CR-IC-3834]