Restructure messenger