[] Image attachement improvements