WIP: CFD-193-Activity stream: insert/update messages

#193 
don't => doesn't