temporary fix for mail performance problems