Hi Dragan

>That's what I was doing all the time, but now for the sake of unifying the code with the rest of the team I'm indenting the comments too - and now the "uncomment" from context menu doesn't work.

If you are hightlighting a block of code which you want to uncomment, shift+tab till the stuff aligns to the left and then use uncomment.