diff --git a/VERAGAddIn/VERAGAddIn.vbproj b/VERAGAddIn/VERAGAddIn.vbproj
index ed1c6cd..370ec37 100644
--- a/VERAGAddIn/VERAGAddIn.vbproj
+++ b/VERAGAddIn/VERAGAddIn.vbproj
@@ -36,7 +36,7 @@
     <PublishUrl>\\ftps.verag.ag\g\FTP\Programme\VeragAddin\</PublishUrl>
     <InstallUrl>http://ftps.verag.ag/VERAGAddin/</InstallUrl>
     <TargetCulture>de</TargetCulture>
-    <ApplicationVersion>1.0.1.136</ApplicationVersion>
+    <ApplicationVersion>1.0.1.137</ApplicationVersion>
     <AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision>
     <UpdateEnabled>true</UpdateEnabled>
     <UpdateInterval>0</UpdateInterval>
diff --git a/VERAGAddIn/frmAvisoAnfügen.Designer.vb b/VERAGAddIn/frmAvisoAnfügen.Designer.vb
index 6a677b7..98dacbf 100644
--- a/VERAGAddIn/frmAvisoAnfügen.Designer.vb
+++ b/VERAGAddIn/frmAvisoAnfügen.Designer.vb
@@ -33,12 +33,12 @@ Partial Class frmAvisoAnfuegen
         Me.lblErr_Aviso = New System.Windows.Forms.Label()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.Label3 = New System.Windows.Forms.Label()
-        Me.cbx = New System.Windows.Forms.CheckBox()
-        Me.CheckBox1 = New System.Windows.Forms.CheckBox()
+        Me.cbxAnhaengeZusaetzlichSpeichern = New System.Windows.Forms.CheckBox()
+        Me.cbxAnhaengeSpeichern = New System.Windows.Forms.CheckBox()
         Me.Label4 = New System.Windows.Forms.Label()
         Me.Label5 = New System.Windows.Forms.Label()
         Me.btnVermerke = New System.Windows.Forms.Button()
-        Me.bttnSaveMail = New System.Windows.Forms.Button()
+        Me.btnSaveMail = New System.Windows.Forms.Button()
         Me.btnSaveAttachments = New System.Windows.Forms.Button()
         Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
@@ -159,32 +159,32 @@ Partial Class frmAvisoAnfuegen
         Me.Label3.TabIndex = 19
         Me.Label3.Text = "Kategorie:"
         '
-        'cbx
+        'cbxAnhaengeZusaetzlichSpeichern
         '
-        Me.cbx.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.cbx.AutoSize = True
-        Me.cbx.Checked = True
-        Me.cbx.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.cbx.Location = New System.Drawing.Point(535, 650)
-        Me.cbx.Name = "cbx"
-        Me.cbx.Size = New System.Drawing.Size(179, 17)
-        Me.cbx.TabIndex = 22
-        Me.cbx.Text = "Anhänge zusätzlich abspeichern"
-        Me.cbx.UseVisualStyleBackColor = True
+        Me.cbxAnhaengeZusaetzlichSpeichern.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.cbxAnhaengeZusaetzlichSpeichern.AutoSize = True
+        Me.cbxAnhaengeZusaetzlichSpeichern.Checked = True
+        Me.cbxAnhaengeZusaetzlichSpeichern.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxAnhaengeZusaetzlichSpeichern.Location = New System.Drawing.Point(535, 650)
+        Me.cbxAnhaengeZusaetzlichSpeichern.Name = "cbxAnhaengeZusaetzlichSpeichern"
+        Me.cbxAnhaengeZusaetzlichSpeichern.Size = New System.Drawing.Size(179, 17)
+        Me.cbxAnhaengeZusaetzlichSpeichern.TabIndex = 22
+        Me.cbxAnhaengeZusaetzlichSpeichern.Text = "Anhänge zusätzlich abspeichern"
+        Me.cbxAnhaengeZusaetzlichSpeichern.UseVisualStyleBackColor = True
         '
-        'CheckBox1
+        'cbxAnhaengeSpeichern
         '
-        Me.CheckBox1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.CheckBox1.AutoSize = True
-        Me.CheckBox1.Checked = True
-        Me.CheckBox1.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.CheckBox1.Location = New System.Drawing.Point(15, 651)
-        Me.CheckBox1.Name = "CheckBox1"
-        Me.CheckBox1.Size = New System.Drawing.Size(118, 17)
-        Me.CheckBox1.TabIndex = 23
-        Me.CheckBox1.Text = "Anhänge speichern"
-        Me.CheckBox1.UseVisualStyleBackColor = True
-        Me.CheckBox1.Visible = False
+        Me.cbxAnhaengeSpeichern.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.cbxAnhaengeSpeichern.AutoSize = True
+        Me.cbxAnhaengeSpeichern.Checked = True
+        Me.cbxAnhaengeSpeichern.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxAnhaengeSpeichern.Location = New System.Drawing.Point(15, 651)
+        Me.cbxAnhaengeSpeichern.Name = "cbxAnhaengeSpeichern"
+        Me.cbxAnhaengeSpeichern.Size = New System.Drawing.Size(118, 17)
+        Me.cbxAnhaengeSpeichern.TabIndex = 23
+        Me.cbxAnhaengeSpeichern.Text = "Anhänge speichern"
+        Me.cbxAnhaengeSpeichern.UseVisualStyleBackColor = True
+        Me.cbxAnhaengeSpeichern.Visible = False
         '
         'Label4
         '
@@ -224,19 +224,19 @@ Partial Class frmAvisoAnfuegen
         Me.btnVermerke.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         Me.btnVermerke.UseVisualStyleBackColor = True
         '
-        'bttnSaveMail
+        'btnSaveMail
         '
-        Me.bttnSaveMail.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.bttnSaveMail.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.bttnSaveMail.Image = Global.VERAGAddIn.My.Resources.Resources.email_big1
-        Me.bttnSaveMail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.bttnSaveMail.Location = New System.Drawing.Point(535, 596)
-        Me.bttnSaveMail.Name = "bttnSaveMail"
-        Me.bttnSaveMail.Size = New System.Drawing.Size(179, 53)
-        Me.bttnSaveMail.TabIndex = 11
-        Me.bttnSaveMail.Text = "E-Mail speichern" & Global.Microsoft.VisualBasic.ChrW(13)
-        Me.bttnSaveMail.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.bttnSaveMail.UseVisualStyleBackColor = True
+        Me.btnSaveMail.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.btnSaveMail.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnSaveMail.Image = Global.VERAGAddIn.My.Resources.Resources.email_big1
+        Me.btnSaveMail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnSaveMail.Location = New System.Drawing.Point(535, 596)
+        Me.btnSaveMail.Name = "btnSaveMail"
+        Me.btnSaveMail.Size = New System.Drawing.Size(179, 53)
+        Me.btnSaveMail.TabIndex = 11
+        Me.btnSaveMail.Text = "E-Mail speichern" & Global.Microsoft.VisualBasic.ChrW(13)
+        Me.btnSaveMail.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnSaveMail.UseVisualStyleBackColor = True
         '
         'btnSaveAttachments
         '
@@ -520,7 +520,7 @@ Partial Class frmAvisoAnfuegen
         Me.Controls.Add(Me.lblErr_Bezeichnung)
         Me.Controls.Add(Me.txtBezeichnung)
         Me.Controls.Add(Me.Label2)
-        Me.Controls.Add(Me.bttnSaveMail)
+        Me.Controls.Add(Me.btnSaveMail)
         Me.Controls.Add(Me.btnSaveAttachments)
         Me.Controls.Add(Me.Button1)
         Me.Controls.Add(Me.txtAbfertigungsnummer)
@@ -530,8 +530,8 @@ Partial Class frmAvisoAnfuegen
         Me.Controls.Add(Me.Label13)
         Me.Controls.Add(Me.Label14)
         Me.Controls.Add(Me.lbl)
-        Me.Controls.Add(Me.cbx)
-        Me.Controls.Add(Me.CheckBox1)
+        Me.Controls.Add(Me.cbxAnhaengeZusaetzlichSpeichern)
+        Me.Controls.Add(Me.cbxAnhaengeSpeichern)
         Me.ForeColor = System.Drawing.SystemColors.ControlText
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
         Me.Name = "frmAvisoAnfuegen"
@@ -554,7 +554,7 @@ Partial Class frmAvisoAnfuegen
     Friend WithEvents dgvAviso As VERAG_PROG_ALLGEMEIN.MyDatagridview
     Friend WithEvents Button1 As Windows.Forms.Button
     Friend WithEvents btnSaveAttachments As Windows.Forms.Button
-    Friend WithEvents bttnSaveMail As Windows.Forms.Button
+    Friend WithEvents btnSaveMail As Windows.Forms.Button
     Friend WithEvents Label2 As Windows.Forms.Label
     Friend WithEvents txtBezeichnung As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents lblErr_Bezeichnung As Windows.Forms.Label
@@ -565,8 +565,8 @@ Partial Class frmAvisoAnfuegen
     Friend WithEvents Label3 As Windows.Forms.Label
     Friend WithEvents cboArt As VERAG_PROG_ALLGEMEIN.MyComboBox
     Friend WithEvents dgvAnhaenge As VERAG_PROG_ALLGEMEIN.MyDatagridview
-    Friend WithEvents cbx As Windows.Forms.CheckBox
-    Friend WithEvents CheckBox1 As Windows.Forms.CheckBox
+    Friend WithEvents cbxAnhaengeZusaetzlichSpeichern As Windows.Forms.CheckBox
+    Friend WithEvents cbxAnhaengeSpeichern As Windows.Forms.CheckBox
     Friend WithEvents Label4 As Windows.Forms.Label
     Friend WithEvents columnName As Windows.Forms.DataGridViewTextBoxColumn
     Friend WithEvents Pfad As Windows.Forms.DataGridViewTextBoxColumn
diff --git a/VERAGAddIn/frmAvisoAnfügen.vb b/VERAGAddIn/frmAvisoAnfügen.vb
index f70feb0..dbfb1a6 100644
--- a/VERAGAddIn/frmAvisoAnfügen.vb
+++ b/VERAGAddIn/frmAvisoAnfügen.vb
@@ -7,7 +7,7 @@ Public Class frmAvisoAnfuegen
     Public AvisoId = -1
     Public SendungsId = -1
     Public Bezeichnung = ""
-    Public PDF_MAIL = ""
+    Public PDF_MAIL As cANHANGSART_ADDIN
     Public Art = ""
     Dim VSQL As New VERAG_PROG_ALLGEMEIN.SQL
 
@@ -59,7 +59,7 @@ Public Class frmAvisoAnfuegen
         If ATT.Count = 0 Then
             btnSaveAttachments.Enabled = False
         Else
-            btnSaveAttachments.Enabled = CheckBox1.Checked
+            btnSaveAttachments.Enabled = cbxAnhaengeSpeichern.Checked
             For Each a In ATT
                 Dim display = a
                 If a.Contains("\") Then
@@ -181,7 +181,7 @@ Public Class frmAvisoAnfuegen
     End Sub
 
 
-    Private Sub btn_Click(sender As Object, e As EventArgs) Handles btnSaveAttachments.Click, bttnSaveMail.Click
+    Private Sub btn_Click(sender As Object, e As EventArgs) Handles btnSaveAttachments.Click, btnSaveMail.Click
         lblErr_Bezeichnung.Visible = False
         lblErr_Aviso.Visible = False
         If dgvAviso.SelectedRows.Count > 0 Then
@@ -195,8 +195,21 @@ Public Class frmAvisoAnfuegen
             Else
                 Me.SendungsId = -1
             End If
-            If sender Is btnSaveAttachments Then PDF_MAIL = "PDF"
-            If sender Is bttnSaveMail Then PDF_MAIL = If(CheckBox1.Checked, If(cbx.Checked, "PDFMAIL", "MAIL"), "ONLYMAIL")
+            If sender Is btnSaveAttachments Then
+                PDF_MAIL = cANHANGSART_ADDIN.PDF
+            End If
+            If sender Is btnSaveMail Then
+                If cbxAnhaengeSpeichern.Checked Then
+                    If cbxAnhaengeZusaetzlichSpeichern.Checked Then
+                        PDF_MAIL = cANHANGSART_ADDIN.PDFANDMAIL
+                    Else
+                        PDF_MAIL = cANHANGSART_ADDIN.YMAIL
+                    End If
+                Else
+                    PDF_MAIL = cANHANGSART_ADDIN.YMAIL
+                End If
+
+            End If
             Bezeichnung = txtBezeichnung.Text
             Me.DialogResult = Windows.Forms.DialogResult.OK
         Else
@@ -238,11 +251,11 @@ Public Class frmAvisoAnfuegen
         End If
     End Sub
 
-    Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox1.CheckedChanged
-        dgvAnhaenge.Enabled = CheckBox1.Checked
-        cbx.Enabled = CheckBox1.Checked
+    Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles cbxAnhaengeSpeichern.CheckedChanged
+        dgvAnhaenge.Enabled = cbxAnhaengeSpeichern.Checked
+        cbxAnhaengeZusaetzlichSpeichern.Enabled = cbxAnhaengeSpeichern.Checked
 
-        If CheckBox1.Checked Then
+        If cbxAnhaengeSpeichern.Checked Then
             btnSaveAttachments.Enabled = dgvAnhaenge.Rows.Count > 0
         Else
             btnSaveAttachments.Enabled = False
diff --git a/VERAGAddIn/frmAvisoFormularAnfügen.Designer.vb b/VERAGAddIn/frmAvisoFormularAnfügen.Designer.vb
index 3787c78..44915ee 100644
--- a/VERAGAddIn/frmAvisoFormularAnfügen.Designer.vb
+++ b/VERAGAddIn/frmAvisoFormularAnfügen.Designer.vb
@@ -38,11 +38,11 @@ Partial Class frmAvisoFormularAnfuegen
         Me.pbAnhaenge = New System.Windows.Forms.PictureBox()
         Me.lblMultiAttachements = New System.Windows.Forms.Label()
         Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.Pfad = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
         Me.btnOK = New System.Windows.Forms.Button()
         Me.btnCancel = New System.Windows.Forms.Button()
-        Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.Pfad = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.panelKunden.SuspendLayout()
         Me.pnlBottom.SuspendLayout()
         CType(Me.pbAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -153,9 +153,9 @@ Partial Class frmAvisoFormularAnfuegen
         'pnlDetails
         '
         Me.pnlDetails.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
-        Me.pnlDetails.Location = New System.Drawing.Point(0, 103)
+        Me.pnlDetails.Location = New System.Drawing.Point(12, 103)
         Me.pnlDetails.Name = "pnlDetails"
-        Me.pnlDetails.Size = New System.Drawing.Size(518, 426)
+        Me.pnlDetails.Size = New System.Drawing.Size(492, 426)
         Me.pnlDetails.TabIndex = 38
         '
         'pnlBottom
@@ -175,9 +175,9 @@ Partial Class frmAvisoFormularAnfuegen
         Me.pbAnhaenge.Anchor = System.Windows.Forms.AnchorStyles.Bottom
         Me.pbAnhaenge.Enabled = False
         Me.pbAnhaenge.Image = Global.VERAGAddIn.My.Resources.Resources.pdf_gray
-        Me.pbAnhaenge.Location = New System.Drawing.Point(12, 106)
+        Me.pbAnhaenge.Location = New System.Drawing.Point(18, 112)
         Me.pbAnhaenge.Name = "pbAnhaenge"
-        Me.pbAnhaenge.Size = New System.Drawing.Size(63, 52)
+        Me.pbAnhaenge.Size = New System.Drawing.Size(57, 41)
         Me.pbAnhaenge.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
         Me.pbAnhaenge.TabIndex = 32
         Me.pbAnhaenge.TabStop = False
@@ -213,6 +213,20 @@ Partial Class frmAvisoFormularAnfuegen
         Me.dgvAnhaenge.TabIndex = 39
         Me.dgvAnhaenge.Visible = False
         '
+        'columnName
+        '
+        Me.columnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
+        Me.columnName.HeaderText = "Name"
+        Me.columnName.Name = "columnName"
+        Me.columnName.ReadOnly = True
+        '
+        'Pfad
+        '
+        Me.Pfad.HeaderText = "Pfad"
+        Me.Pfad.Name = "Pfad"
+        Me.Pfad.ReadOnly = True
+        Me.Pfad.Visible = False
+        '
         'MyPanel1
         '
         Me.MyPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
@@ -245,20 +259,6 @@ Partial Class frmAvisoFormularAnfuegen
         Me.btnCancel.Text = "Abbrechen"
         Me.btnCancel.UseVisualStyleBackColor = True
         '
-        'columnName
-        '
-        Me.columnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
-        Me.columnName.HeaderText = "Name"
-        Me.columnName.Name = "columnName"
-        Me.columnName.ReadOnly = True
-        '
-        'Pfad
-        '
-        Me.Pfad.HeaderText = "Pfad"
-        Me.Pfad.Name = "Pfad"
-        Me.Pfad.ReadOnly = True
-        Me.Pfad.Visible = False
-        '
         'frmAvisoFormularAnfuegen
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
diff --git a/VERAGAddIn/frmAvisoFormularAnfügen.vb b/VERAGAddIn/frmAvisoFormularAnfügen.vb
index cf48d00..4e3c406 100644
--- a/VERAGAddIn/frmAvisoFormularAnfügen.vb
+++ b/VERAGAddIn/frmAvisoFormularAnfügen.vb
@@ -1,11 +1,6 @@
-Imports System.Collections
-Imports System.Data
-Imports System.Diagnostics
-Imports System.Diagnostics.Tracing
+Imports System.Diagnostics
 Imports System.Drawing
-Imports System.Net
 Imports System.Windows.Forms
-Imports System.Windows.Forms.VisualStyles.VisualStyleElement.Button
 Imports Microsoft.Office.Tools.Ribbon
 Imports SDL
 Imports VERAG_PROG_ALLGEMEIN
@@ -19,7 +14,7 @@ Public Class frmAvisoFormularAnfuegen
     Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
     Public SendungsId = -1
     Public Bezeichnung = ""
-    Public PDF_MAIL = ""
+    Public PDF_MAIL As cANHANGSART_ADDIN
     Public enableOverwritting As Boolean = False
     Public ATTTemp As List(Of String)
     Public ATT As List(Of String)
@@ -174,14 +169,15 @@ Public Class frmAvisoFormularAnfuegen
         Select Case button.Name
 
             Case "btnVertraege"
-                UsrCntlVertraege1.dgvVertraegeNew.GetOrder()
-                UsrCntlVertraege1.initDGVVertraege(KdNr)
-                UsrCntlVertraege1.dgvVertraegeNew.SetOrder()
 
                 If UsrCntlVertraege1.dgvVertraegeNew.SelectedRows.Count < 1 Then
                     MsgBox("Bitte einen Vertrag markieren")
                 End If
 
+                UsrCntlVertraege1.dgvVertraegeNew.GetOrder()
+                UsrCntlVertraege1.initDGVVertraege(KdNr)
+                UsrCntlVertraege1.dgvVertraegeNew.SetOrder()
+
             Case "btnGestellungsgarantien"
                 UsrCntlGestellungsgarantien1.dgvGestGarantieNew.GetOrder()
                 UsrCntlGestellungsgarantien1.initDGVGestGarantie(KdNr)
@@ -195,33 +191,33 @@ Public Class frmAvisoFormularAnfuegen
 
         If Not hasAnhaenge Then
 
-            If Not vbYes = MsgBox("Diese Email besitzt keinen Anhang!" & vbCrLf & "Soll die Email als Anhang gespeichert werden?", vbYesNoCancel) Then
-                Close()
-                DialogResult = DialogResult.None
-                Exit Sub
-            End If
-        End If
+            'If Not vbYes = MsgBox("Diese Email besitzt keinen Anhang!" & vbCrLf & "Soll die Email als Anhang gespeichert werden?", vbYesNoCancel) Then
+            '    Close()
+            '    DialogResult = DialogResult.None
+        Else
 
-        If ATT IsNot Nothing Then
-            If ATT.Count > 1 Then
-                ATT = ATTTemp
-                If dgvAnhaenge.SelectedRows.Count = 0 Then
-                    MsgBox("Bitte Anhang markieren!")
-                    DialogResult = DialogResult.None
-                    Exit Sub
-                Else
-                    Dim listOfSelectedAttachmendIndex As New List(Of Integer)
-                    For Each indexOfAttachment As DataGridViewRow In dgvAnhaenge.SelectedRows
-                        listOfSelectedAttachmendIndex.Add(indexOfAttachment.Index)
-                    Next
+            If ATT IsNot Nothing Then
+                If ATT.Count > 1 Then
+                    ATT = ATTTemp
+                    If dgvAnhaenge.SelectedRows.Count = 0 Then
+                        MsgBox("Bitte Anhang markieren!")
+                        DialogResult = DialogResult.None
+                        Exit Sub
+                    Else
+                        Dim listOfSelectedAttachmendIndex As New List(Of Integer)
+                        For Each indexOfAttachment As DataGridViewRow In dgvAnhaenge.SelectedRows
+                            listOfSelectedAttachmendIndex.Add(indexOfAttachment.Index)
+                        Next
 
-                    RemoveNotUsedAttachmentOnList(ATT, listOfSelectedAttachmendIndex)
+                        RemoveNotUsedAttachmentOnList(ATT, listOfSelectedAttachmendIndex)
 
+                    End If
                 End If
             End If
         End If
 
 
+
         Select Case button.Name
 
             Case "btnVollmachten"
@@ -239,13 +235,21 @@ Public Class frmAvisoFormularAnfuegen
 
                 ElseIf UsrCntlVertraege1.dgvVertraegeNew.SelectedRows.Count = 1 Then
 
+                    Dim hasExistingEmail As Boolean = False
+                    Dim hasExistingAttachment As Boolean = False
+
                     For Each row As DataGridViewRow In UsrCntlVertraege1.dgvVertraegeNew.SelectedRows
-                        If row.Cells("kv_datenarchivId").Value Is DBNull.Value Or row.Cells("kv_datenarchivId").Value Is Nothing Then
-                            setAvisoIdForVertrage()
-                        Else
+
+                        If (row.Cells("kv_datenarchivId_mail").Value IsNot Nothing AndAlso IsNumeric(row.Cells("kv_datenarchivId_mail").Value) AndAlso CInt(row.Cells("kv_datenarchivId_mail").Value) > 0) Then hasExistingEmail = True
+
+                        If (row.Cells("kv_datenarchivId").Value IsNot Nothing AndAlso IsNumeric(row.Cells("kv_datenarchivId").Value) AndAlso CInt(row.Cells("kv_datenarchivId").Value) > 0) Then hasExistingAttachment = True
+
+                        setAvisoIdForVertrage()
+
+                        If hasAnhaenge AndAlso hasExistingAttachment Then
                             Dim response = MsgBox("Der markierte Vertrag besitzt bereits einen Anhang!" & vbCrLf & "Soll der Anhang ersetzt werden?", vbYesNoCancel)
                             If response = vbYes Then
-                                setAvisoIdForVertrage()
+                                'setAvisoIdForVertrage()
                                 enableOverwritting = True
                             ElseIf response = vbCancel Then
                                 DialogResult = DialogResult.None
@@ -255,11 +259,37 @@ Public Class frmAvisoFormularAnfuegen
                             End If
                         End If
 
+
+
                     Next
+
+                    Dim ASKMailSpeichern As String = ""
+
+                    If hasAnhaenge Then
+                        ASKMailSpeichern = "Soll die Mail auch gespeichert werden!" & IIf(hasExistingEmail, vbNewLine & "Die aktuell hinterlegte Mail wird dadurch überschrieben!", "")
+                    Else
+                        ASKMailSpeichern = "Soll die Mail als Anhang gepeichert werden!" & IIf(hasExistingEmail, vbNewLine & "Die aktuell hinterlegte Mail wird dadurch überschrieben!", "")
+                    End If
+
+                    If vbYes = MsgBox(ASKMailSpeichern, vbYesNoCancel) Then
+                        If hasExistingEmail Then enableOverwritting = True
+                        If ATT.Count = 0 Then
+                            PDF_MAIL = cANHANGSART_ADDIN.MAIL_DATENSERVER '"ONLYMAIL_DATENSERVER"
+                        Else
+                            PDF_MAIL = cANHANGSART_ADDIN.PDFANDMAIL_DATENSERVER '"PDFMAIL_DATENSERVER"
+                        End If
+                    Else
+                        If ATT.Count = 0 Then
+                            DialogResult = DialogResult.None
+                            Exit Sub
+                        End If
+
+                    End If
+
                     Me.DialogResult = DialogResult.OK
-                    Close()
-                Else
-                    Close()
+                        Close()
+                    Else
+                        Close()
                 End If
 
 
@@ -352,13 +382,13 @@ Public Class frmAvisoFormularAnfuegen
 
         If ATT.Count = 0 Then
             hasAnhaenge = False
-            PDF_MAIL = "ONLYMAIL_DATENSERVER"
+            PDF_MAIL = cANHANGSART_ADDIN.MAIL_DATENSERVER '"ONLYMAIL_DATENSERVER"
         Else
             hasAnhaenge = True
             If button.Name = "btnVollmachten" Then
-                PDF_MAIL = "PDF_DATENSERVER"
+                PDF_MAIL = cANHANGSART_ADDIN.PDFANDMAIL_DATENSERVER '"PDFANDMAIL_DATENSERVER"
             Else
-                PDF_MAIL = "ONLYPDF_DATENSERVER"
+                PDF_MAIL = cANHANGSART_ADDIN.PDF_DATENSERVER '"ONLYPDF_DATENSERVER"
             End If
 
 
diff --git a/VERAGAddIn/rbnVERAG.vb b/VERAGAddIn/rbnVERAG.vb
index f6eda55..bc7ef0d 100644
--- a/VERAGAddIn/rbnVERAG.vb
+++ b/VERAGAddIn/rbnVERAG.vb
@@ -14,6 +14,20 @@ Imports Microsoft.Office.Interop
 Imports Microsoft.Office.Tools.Ribbon
 Imports VERAG_PROG_ALLGEMEIN
 
+Public Enum cANHANGSART_ADDIN
+    'Upload in Datenarchiv
+    PDF = 1
+    YMAIL = 2
+    PDFANDMAIL = 3
+
+    'Upload in Datenarchiv inkl. Zuweisung zu Objekt
+    PDFANDMAIL_DATENSERVER = 4
+    PDF_DATENSERVER = 5
+    MAIL_DATENSERVER = 6
+
+End Enum
+
+
 
 Public Class VERAGRibbon
     Dim LOGIN_OK = False
@@ -158,7 +172,7 @@ Public Class AVISO_Mail_Functions
                     strFileName &= ".msg"
                 End If
                 'Dim strFileName As String = "Mail.msg"
-                Dim pdf_mail = ""
+                Dim pdf_mail As cANHANGSART_ADDIN
                 Dim SendungsId = -1
                 Dim Art = ""
                 Dim kdNr = -1
@@ -184,21 +198,33 @@ Public Class AVISO_Mail_Functions
 
                 Dim BezAnhang = If(Bezeichnung <> strFileName, Bezeichnung, "") 'Wenn die Bezeichnung geändert wurde --> und wenn nur 1 Anhang, dann wird die Bezeichnung für den Anhang verwendet.
 
-                If pdf_mail = "PDF" Then
-                    saveAttachment(ATTACHMENTS_LIST, AvisoId, SendungsId, Art, BezAnhang)
-                ElseIf pdf_mail = "PDFMAIL" Then
-                    saveMail(mailItem, AvisoId, Bezeichnung,, SendungsId, Art)
-                    saveAttachment(ATTACHMENTS_LIST, AvisoId, SendungsId, Art, BezAnhang)
-                ElseIf pdf_mail = "PDF_DATENSERVER" Then
-                    saveMailOnDatenserver(mailItem, AvisoId, Bezeichnung, sender,, kdNr)
-                    saveAttachmentOnDatenserver(ATTACHMENTS_LIST, AvisoId, BezAnhang, sender, kdNr)
-                ElseIf pdf_mail = "ONLYPDF_DATENSERVER" Then
-                    saveAttachmentOnDatenserver(ATTACHMENTS_LIST, AvisoId, BezAnhang, sender, kdNr, enableOverwritting)
-                ElseIf pdf_mail = "ONLYMAIL_DATENSERVER" Then
-                    saveMailOnDatenserver(mailItem, AvisoId, Bezeichnung, sender, , kdNr)
-                Else 'ONLYMAIL
-                    saveMail(mailItem, AvisoId, Bezeichnung,, SendungsId, Art)
-                End If
+
+                Select Case pdf_mail
+                    Case cANHANGSART_ADDIN.PDF : saveAttachment(ATTACHMENTS_LIST, AvisoId, SendungsId, Art, BezAnhang)
+                    Case cANHANGSART_ADDIN.YMAIL : saveMail(mailItem, AvisoId, Bezeichnung,, SendungsId, Art)
+                    Case cANHANGSART_ADDIN.PDFANDMAIL : saveMail(mailItem, AvisoId, Bezeichnung,, SendungsId, Art) : saveAttachment(ATTACHMENTS_LIST, AvisoId, SendungsId, Art, BezAnhang)
+                    Case cANHANGSART_ADDIN.PDF_DATENSERVER : saveAttachmentOnDatenserver(ATTACHMENTS_LIST, AvisoId, BezAnhang, sender, kdNr, enableOverwritting)
+                    Case cANHANGSART_ADDIN.MAIL_DATENSERVER : saveMailOnDatenserver(mailItem, AvisoId, Bezeichnung, sender, , kdNr, enableOverwritting)
+                    Case cANHANGSART_ADDIN.PDFANDMAIL_DATENSERVER : saveMailOnDatenserver(mailItem, AvisoId, Bezeichnung, sender, , kdNr) : saveAttachmentOnDatenserver(ATTACHMENTS_LIST, AvisoId, BezAnhang, sender, kdNr)
+                    Case Else
+                        saveMail(mailItem, AvisoId, Bezeichnung,, SendungsId, Art)
+                End Select
+
+                'If pdf_mail = "PDF" Then
+                '    saveAttachment(ATTACHMENTS_LIST, AvisoId, SendungsId, Art, BezAnhang)
+                'ElseIf pdf_mail = "PDFANDMAIL" Then
+                '    saveMail(mailItem, AvisoId, Bezeichnung,, SendungsId, Art)
+                '    saveAttachment(ATTACHMENTS_LIST, AvisoId, SendungsId, Art, BezAnhang)
+                'ElseIf pdf_mail = "PDFANDMAIL_DATENSERVER" Then
+                '    saveMailOnDatenserver(mailItem, AvisoId, Bezeichnung, sender,, kdNr)
+                '    saveAttachmentOnDatenserver(ATTACHMENTS_LIST, AvisoId, BezAnhang, sender, kdNr)
+                'ElseIf pdf_mail = "ONLYPDF_DATENSERVER" Then
+                '    saveAttachmentOnDatenserver(ATTACHMENTS_LIST, AvisoId, BezAnhang, sender, kdNr, enableOverwritting)
+                'ElseIf pdf_mail = "ONLYMAIL_DATENSERVER" Then
+                '    saveMailOnDatenserver(mailItem, AvisoId, Bezeichnung, sender, , kdNr)
+                'Else 'ONLYMAIL
+                '    saveMail(mailItem, AvisoId, Bezeichnung,, SendungsId, Art)
+                'End If
             End If
 
         Catch ex As Exception
@@ -1057,7 +1083,7 @@ Public Class AVISO_Mail_Functions
                 Dim path = DS.uploadDataToDATENSERVER(strTmpPath)
                 If path Then
                     Dim c As New cKundenVollmachten(AvisoId)
-                    If bezeichnung.EndsWith(".pdf") Then
+                    If bezeichnung.ToLower.EndsWith(".pdf") Then
                         c.kdvm_datenarchivId = DS.da_id
                     Else
                         c.kdvm_emailId = DS.da_id
@@ -1067,14 +1093,27 @@ Public Class AVISO_Mail_Functions
 
             Case "btnVertraege"
 
-                Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "KD_VERTRÄGE", "", "", "", "KV_" & AvisoId, kdNr, multifiles)
-                Dim path = DS.uploadDataToDATENSERVER(strTmpPath,,,,,, enableOverweriting)
-                If path Then
-                    Dim KV As New VERAG_PROG_ALLGEMEIN.cKundenVertraege(AvisoId)
-                    KV.kv_datenarchivId = DS.da_id
-                    KV.SAVE()
-                End If
+                'Bei Verträge können PDF und MAIL angehängt werden!
 
+                If bezeichnung.ToLower.EndsWith(".pdf") Then
+                    Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "KD_VERTRÄGE", "", "", "", "KV_" & AvisoId, kdNr, multifiles)
+                    Dim path = DS.uploadDataToDATENSERVER(strTmpPath,,,,,, enableOverweriting)
+                    If path Then
+                        Dim KV As New VERAG_PROG_ALLGEMEIN.cKundenVertraege(AvisoId)
+                        KV.kv_datenarchivId = DS.da_id
+                        KV.SAVE()
+                    End If
+
+                Else
+                    Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "KD_VERTRÄGE", "", "", "", "KV_Mail_" & AvisoId, kdNr, multifiles)
+                    Dim path = DS.uploadDataToDATENSERVER(strTmpPath,,,,,, enableOverweriting)
+                    If path Then
+                        Dim KV As New VERAG_PROG_ALLGEMEIN.cKundenVertraege(AvisoId)
+                        KV.kv_datenarchivId_mail = DS.da_id
+                        KV.SAVE()
+                    End If
+
+                End If
 
             Case "btnGestellungsgarantien"