#254 - Fix adding tasks and messages