Mail system functionality & link fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	template/aside.html