Feature/forward messages ok