warning system message appends after 9mins in chat

Test's in jasmine-testing branch will fail, pulling down now to fix, will remerge that branch.