diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
index b1d20151..262ef22d 100644
--- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
+++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
@@ -391,4 +391,10 @@ Partial Public Class frmEnvelopeEditor
 
         Me.Text = oFormTitle
     End Sub
+
+    Private Sub frmEnvelopeEditor_FormClosing(sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing
+        If Controller.Envelope?.Status = EnvelopeStatus.EnvelopeCreated Then
+            Controller.DeleteEnvelopeFromDisk(Controller.Envelope)
+        End If
+    End Sub
 End Class
diff --git a/EnvelopeGenerator.Form/frmMain.Designer.vb b/EnvelopeGenerator.Form/frmMain.Designer.vb
index 1dfa7edb..e34689e9 100644
--- a/EnvelopeGenerator.Form/frmMain.Designer.vb
+++ b/EnvelopeGenerator.Form/frmMain.Designer.vb
@@ -40,6 +40,7 @@ Partial Class frmMain
         Me.ColHistoryUserReference = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.ColHistoryDate = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.ViewEnvelopes = New DevExpress.XtraGrid.Views.Grid.GridView()
+        Me.colEnvelopeId = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colContractType = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colStatus = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colTitle = New DevExpress.XtraGrid.Columns.GridColumn()
@@ -72,7 +73,6 @@ Partial Class frmMain
         Me.GridColumn6 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.GridColumn7 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.RefreshTimer = New System.Windows.Forms.Timer(Me.components)
-        Me.colEnvelopeId = New DevExpress.XtraGrid.Columns.GridColumn()
         CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainerControl1.Panel1.SuspendLayout()
@@ -225,6 +225,12 @@ Partial Class frmMain
         Me.ViewEnvelopes.GridControl = Me.GridEnvelopes
         Me.ViewEnvelopes.Name = "ViewEnvelopes"
         '
+        'colEnvelopeId
+        '
+        resources.ApplyResources(Me.colEnvelopeId, "colEnvelopeId")
+        Me.colEnvelopeId.FieldName = "Id"
+        Me.colEnvelopeId.Name = "colEnvelopeId"
+        '
         'colContractType
         '
         resources.ApplyResources(Me.colContractType, "colContractType")
@@ -448,12 +454,6 @@ Partial Class frmMain
         Me.RefreshTimer.Enabled = True
         Me.RefreshTimer.Interval = 120000
         '
-        'colEnvelopeId
-        '
-        resources.ApplyResources(Me.colEnvelopeId, "colEnvelopeId")
-        Me.colEnvelopeId.FieldName = "Id"
-        Me.colEnvelopeId.Name = "colEnvelopeId"
-        '
         'frmMain
         '
         resources.ApplyResources(Me, "$this")
diff --git a/EnvelopeGenerator.Form/frmMain.resx b/EnvelopeGenerator.Form/frmMain.resx
index 105ad90e..abffd8d5 100644
--- a/EnvelopeGenerator.Form/frmMain.resx
+++ b/EnvelopeGenerator.Form/frmMain.resx
@@ -847,6 +847,12 @@
   <data name="&gt;&gt;ViewEnvelopes.Type" xml:space="preserve">
     <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;colEnvelopeId.Name" xml:space="preserve">
+    <value>colEnvelopeId</value>
+  </data>
+  <data name="&gt;&gt;colEnvelopeId.Type" xml:space="preserve">
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;colContractType.Name" xml:space="preserve">
     <value>colContractType</value>
   </data>
@@ -1015,12 +1021,6 @@
   <data name="&gt;&gt;RefreshTimer.Type" xml:space="preserve">
     <value>System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;colEnvelopeId.Name" xml:space="preserve">
-    <value>colEnvelopeId</value>
-  </data>
-  <data name="&gt;&gt;colEnvelopeId.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>frmMain</value>
   </data>
diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb
index da01bc68..c3089183 100644
--- a/EnvelopeGenerator.Form/frmMain.vb
+++ b/EnvelopeGenerator.Form/frmMain.vb
@@ -191,8 +191,10 @@ Public Class frmMain
         Select Case XtraTabControl1.SelectedTabPageIndex
             Case 1
                 btnEditEnvelope.Enabled = False
+                btnDeleteEnvelope.Enabled = False
             Case 0
                 btnEditEnvelope.Enabled = True
+                btnDeleteEnvelope.Enabled = True
         End Select
     End Sub
 
@@ -249,17 +251,39 @@ Public Class frmMain
     End Sub
 
     Private Sub RefreshTimer_Tick(sender As Object, e As EventArgs) Handles RefreshTimer.Tick
-        LoadEnvelopeData()
+        If Application.OpenForms.OfType(Of frmEnvelopeEditor).Any = False Then
+            LoadEnvelopeData()
+        End If
     End Sub
 
     Private Sub btnContactReceiver_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnContactReceiver.ItemClick
         Dim oView As GridView = GridEnvelopes.FocusedView
         If oView.Name = ViewReceivers.Name Then
-            Console.Write("")
             Dim oReceiver As EnvelopeReceiver = oView.GetRow(oView.FocusedRowHandle)
             Process.Start($"mailto:{oReceiver.Email}")
         Else
             MsgBox("Bitte wählen Sie einen Empfänger aus dem Reiter Empfänger aus.", MsgBoxStyle.Information, Text)
         End If
     End Sub
+
+    Private Sub btnShowDocument_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnShowDocument.ItemClick
+        If ViewEnvelopes.FocusedRowHandle < 0 Then
+            Exit Sub
+        End If
+
+        Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle)
+        Dim oDocument = oEnvelope.Documents.FirstOrDefault()
+
+        If oDocument Is Nothing Then
+            MsgBox("Der Umschlag enthält keine Dokumente.", MsgBoxStyle.Exclamation, Text)
+            Exit Sub
+        End If
+
+        Try
+            Process.Start(oDocument.Filepath)
+        Catch ex As Exception
+            MsgBox("Dokument konnte nicht geöffnet werden!", MsgBoxStyle.Critical, Text)
+            Logger.Error(ex)
+        End Try
+    End Sub
 End Class
\ No newline at end of file