diff --git a/EnvelopeGenerator.Common/Constants.vb b/EnvelopeGenerator.Common/Constants.vb
index ff7eed6d..4605b46c 100644
--- a/EnvelopeGenerator.Common/Constants.vb
+++ b/EnvelopeGenerator.Common/Constants.vb
@@ -55,6 +55,11 @@
         ReceiverColor9 = 9
         ReceiverColor10 = 10
     End Enum
+
+    Public Enum PageOrientation
+        Portrait = 0
+        Landscape = 1
+    End Enum
 #End Region
 
 
diff --git a/EnvelopeGenerator.Common/Strings/Envelope.resx b/EnvelopeGenerator.Common/Strings/Envelope.resx
index a8e9ca21..04ad97a3 100644
--- a/EnvelopeGenerator.Common/Strings/Envelope.resx
+++ b/EnvelopeGenerator.Common/Strings/Envelope.resx
@@ -133,10 +133,10 @@
     <value>Dokument konnte nicht gespeichert werden!</value>
   </data>
   <data name="Elements could not be loaded" xml:space="preserve">
-    <value>Elemente konnten nicht geladen werden!</value>
+    <value>Signatur-Elemente konnten nicht geladen werden!</value>
   </data>
   <data name="Elements could not be saved" xml:space="preserve">
-    <value>Elemente konnten nicht gespeichert werden!</value>
+    <value>Signatur-Elemente konnten nicht gespeichert werden!</value>
   </data>
   <data name="Envelope already sent" xml:space="preserve">
     <value>Der Umschlag wurde bereits versendet!</value>
diff --git a/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb b/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb
index 67f37ece..66a67151 100644
--- a/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb
+++ b/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb
@@ -110,7 +110,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Elemente konnten nicht geladen werden! ähnelt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Signatur-Elemente konnten nicht geladen werden! ähnelt.
         '''</summary>
         Public Shared ReadOnly Property Elements_could_not_be_loaded() As String
             Get
@@ -119,7 +119,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Elemente konnten nicht gespeichert werden! ähnelt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Signatur-Elemente konnten nicht gespeichert werden! ähnelt.
         '''</summary>
         Public Shared ReadOnly Property Elements_could_not_be_saved() As String
             Get
diff --git a/EnvelopeGenerator.Form/Controllers/FieldEditorController.vb b/EnvelopeGenerator.Form/Controllers/FieldEditorController.vb
index 5ee61d87..3e76284f 100644
--- a/EnvelopeGenerator.Form/Controllers/FieldEditorController.vb
+++ b/EnvelopeGenerator.Form/Controllers/FieldEditorController.vb
@@ -1,4 +1,5 @@
-Imports EnvelopeGenerator.Common
+Imports DevExpress.XtraPrinting.Native
+Imports EnvelopeGenerator.Common
 Imports GdPicture14.Annotations
 
 Public Class FieldEditorController
@@ -59,12 +60,24 @@ Public Class FieldEditorController
         End If
     End Function
 
-    Public Sub AddOrUpdateElement(pAnnotation As AnnotationStickyNote)
+    Public Sub AddOrUpdateElement(pAnnotation As AnnotationStickyNote, pPageOrientation As PageOrientation)
         Dim oElement = GetElement(pAnnotation)
 
+        Dim oAnnotationHeight As Single = pAnnotation.Height
+        Dim oAnnotationWidth As Single = pAnnotation.Width
+
+        'If pPageOrientation = PageOrientation.Portrait Then
+        '    oAnnotationHeight = pAnnotation.Height
+        '    oAnnotationWidth = pAnnotation.Width
+        'Else
+        '    oAnnotationHeight = pAnnotation.Width
+        '    oAnnotationWidth = pAnnotation.Height
+        'End If
+
+
         If oElement IsNot Nothing Then
-            oElement.Height = pAnnotation.Height
-            oElement.Width = pAnnotation.Width
+            oElement.Height = oAnnotationHeight
+            oElement.Width = oAnnotationWidth
             oElement.X = pAnnotation.Left
             oElement.Y = pAnnotation.Top
         Else
@@ -72,8 +85,8 @@ Public Class FieldEditorController
 
             Elements.Add(New EnvelopeDocumentElement() With {
                 .ElementType = Constants.ElementType.Signature,
-                .Height = pAnnotation.Height,
-                .Width = pAnnotation.Width,
+                .Height = oAnnotationHeight,
+                .Width = oAnnotationWidth,
                 .X = pAnnotation.Left,
                 .Y = pAnnotation.Top,
                 .DocumentId = Document.Id,
diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
index 504c4d99..03a778b3 100644
--- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
+++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
@@ -282,7 +282,7 @@ Partial Public Class frmEnvelopeEditor
         End If
 
         Dim oErrors = ValidateEnvelope()
-        oErrors = Controller.ValidateEn06 - 12 - 2velopeForSending(oErrors)
+        oErrors = Controller.ValidateEnvelopeForSending(oErrors)
 
         If oErrors.Any() Then
             ShowValidationErrors(Resources.Envelope.Error_when_validating_the_envelope, oErrors)
diff --git a/EnvelopeGenerator.Form/frmFieldEditor.vb b/EnvelopeGenerator.Form/frmFieldEditor.vb
index 6c5d01b0..e9d9ca14 100644
--- a/EnvelopeGenerator.Form/frmFieldEditor.vb
+++ b/EnvelopeGenerator.Form/frmFieldEditor.vb
@@ -4,6 +4,7 @@ Imports DevExpress.Utils.Svg
 Imports DevExpress.XtraBars
 Imports DigitalData.Modules.Logging
 Imports EnvelopeGenerator.Common
+Imports EnvelopeGenerator.Common.Constants
 Imports EnvelopeGenerator.Common.My
 Imports GdPicture14
 Imports GdPicture14.Annotations
@@ -188,7 +189,8 @@ Partial Public Class frmFieldEditor
             Dim oAnnotation As Annotation = GDViewer.GetAnnotationFromIdx(oAnnotationIndex)
             If TypeOf oAnnotation Is AnnotationStickyNote Then
                 Dim oStickyNote As AnnotationStickyNote = oAnnotation
-                Controller.AddOrUpdateElement(oStickyNote)
+                Dim oPageOrientation As PageOrientation = GetOrientation()
+                Controller.AddOrUpdateElement(oStickyNote, oPageOrientation)
             End If
         Next
     End Sub
@@ -292,6 +294,18 @@ Partial Public Class frmFieldEditor
         End If
     End Sub
 
+    Private Function GetOrientation() As PageOrientation
+        Dim oWidth = GDViewer.Width
+        Dim oHeight = GDViewer.PageHeight
+
+        If oHeight >= oWidth Then
+            Return PageOrientation.Portrait
+        Else
+            Return PageOrientation.Landscape
+        End If
+
+    End Function
+
     Private Sub ApplyAnnotationStyleForExistingAnnotation(ByRef pAnnotation As Annotation, pColor As Color)
         ApplyAnnotationStyle(pAnnotation, pColor, pIsNewAnnotation:=False)
     End Sub