WIP: CFD-151- Discussion message

#144 
Type:  general instead of gerenal