Fixed bug#8599 - Problem with [] characters in name of attachment file.

Conflicts:
	CHANGES