Merge branch 'bug-644'

Conflicts:
	src/Gui/AttachmentView.cpp
	src/Gui/AttachmentView.h
	src/Gui/PartWidgetFactory.cpp

REVIEW: 110748
REVIEW: 111913