diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
index 56ece3a6..d1dc8c5a 100644
--- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
+++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
@@ -2,6 +2,7 @@
 Imports DevExpress.Export.Xl
 Imports DevExpress.Utils.Drawing
 Imports DevExpress.XtraEditors
+Imports DevExpress.XtraExport.Helpers
 Imports DevExpress.XtraGrid
 Imports DevExpress.XtraGrid.Views.Grid
 Imports DevExpress.XtraSplashScreen
@@ -426,11 +427,19 @@ Partial Public Class frmEnvelopeEditor
 
     Private Sub ViewReceivers_CellValueChanged(sender As Object, e As Views.Base.CellValueChangedEventArgs) Handles ViewReceivers.CellValueChanged
         If e.Column.FieldName = "Email" Then
-            Dim oLastCellValue = ViewReceivers.GetRowCellValue(e.RowHandle, "Name")
-            If oLastCellValue Is Nothing Then
-                Dim oEmailAdress As String = DirectCast(e.Value, String)
-                Dim oLastName As String = Controller.GetLastNameByEmailAdress(oEmailAdress)
-                ViewReceivers.SetRowCellValue(e.RowHandle, ViewReceivers.Columns("Name"), oLastName)
+            If e.Value Is Nothing Then
+                ' Keine E-Mail-Adresse, also weg damit
+                ViewReceivers.DeleteRow(ViewReceivers.FocusedRowHandle)
+            Else
+                ' Doppelte E-Mail-Adresse? TODO
+                'Dim oReceivers = Controller.Envelope.Receivers
+
+                Dim oNameCellValue = ViewReceivers.GetRowCellValue(e.RowHandle, "Name")
+                If oNameCellValue Is Nothing Then
+                    Dim oEmailAdress As String = DirectCast(e.Value, String)
+                    Dim oLastName As String = Controller.GetLastNameByEmailAdress(oEmailAdress)
+                    ViewReceivers.SetRowCellValue(e.RowHandle, ViewReceivers.Columns("Name"), oLastName)
+                End If
             End If
         End If
     End Sub