Separate singular and plurad message form - fix for #58