Fix subscription

The subscription method contained what could be security issue, any email sent by the user would be used as a subscription request.

Fix this and add more tests.