This change prevents http://dev.modoboa.org/issues/464 from happening.