fix for device mail