Messages are now properly related to feeds