[FIX] Solve some mail issues which are currently present in 7.0