Fixes: #2204 mailAccount uid problems