Moved messages to nested folder and added Join messages.