Email (record): Quick fixes