Fixing bugs at emailing system