diff --git a/Aviso/Anhänge/frmSendungAnhangImport.vb b/Aviso/Anhänge/frmSendungAnhangImport.vb
index 3a5dd0a..3b3fa66 100644
--- a/Aviso/Anhänge/frmSendungAnhangImport.vb
+++ b/Aviso/Anhänge/frmSendungAnhangImport.vb
@@ -1936,7 +1936,8 @@ Public Class frmSendungAnhangImport
 
             theStream.Close()
             ' We should have the file name or if its an email, the subject line. Create our temp file based on the temp path and this info
-            Dim myTempFile As String = IO.Path.GetTempPath & fileName.ToString
+            Dim myTempFile As String = IO.Path.GetTempPath & VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(fileName.ToString)
+
             ' Look to see if this is a email message. If so save that temporarily and get the temp file.
             If InStr(myTempFile, ".msg") > 0 Then
                 Dim objOL As New Microsoft.Office.Interop.Outlook.Application
diff --git a/Aviso/usrCntlSND_NCTSGestellungsadresse.Designer.vb b/Aviso/usrCntlSND_NCTSGestellungsadresse.Designer.vb
index c6e1a53..6f9f0bd 100644
--- a/Aviso/usrCntlSND_NCTSGestellungsadresse.Designer.vb
+++ b/Aviso/usrCntlSND_NCTSGestellungsadresse.Designer.vb
@@ -113,6 +113,7 @@ Partial Class usrCntlSND_NCTSGestellungsadresse
         Me.txtT1Verzollungsadresse.key_visible = False
         Me.txtT1Verzollungsadresse.KEYPARAM = Nothing
         Me.txtT1Verzollungsadresse.Location = New System.Drawing.Point(121, 11)
+        Me.txtT1Verzollungsadresse.MaxLength = 35
         Me.txtT1Verzollungsadresse.Name = "txtT1Verzollungsadresse"
         Me.txtT1Verzollungsadresse.searchActive = True
         Me.txtT1Verzollungsadresse.Size = New System.Drawing.Size(269, 20)