bugzids 4171 and 4187: enhanced images support