828877 Issue fix - Do not show confirmation when messages are not selected

Removed comments and curly braces

Second commit with the suggestd changes squashed onto first