Fixes: #1925 fixing mailAccount bug