Merge remote-tracking branch 'remotes/origin/dariusz' into kacper

Conflicts:
	Mail.py
Merge remote-tracking branch 'origin/kacper' into kacper