adding active/inactive messages back in