foosofdkdsf
Merge branch 'master' of https://github.com/Netzfreiheit/pimail

Conflicts:
	widget.tmpl