Fix for attachments and avatars.

Signed-off-by: Sven Rissmann <creaworld-media@gmx.de>