Merge pull request #433 from heracleskasimis/master

Conditional comments at email button mixin