MessageArchiver is implemented + some fixes