Disabling Threaded Comments should permeate to emails also

When the 'Threaded Comments' option is disabled on Confluence General Configuration, emails are still sent using the same template with the 'Reply' option.
for example:
http://<instance-name>wiki/display/space/page?replyToComment=6324225#comment-6324225

That page will not allow you to add a Reply or Comment.

Removing the '?replyToComment=6324225#comment-6324225' part of the url will display the Add Comment box as expected.

How to Reproduce:

1. Disable 'Threaded Comments'
2. Comment on a page
3. upon reception of the email, click on Reply

Ideas:
Since there is no Threads, then the Reply button can be changed to 'Comment' (along with modifying the link) or removed.