diff --git a/pages/email/new.vue b/pages/email/new.vue
index 390559d..76c997a 100644
--- a/pages/email/new.vue
+++ b/pages/email/new.vue
@@ -30,7 +30,7 @@ const setupPage = async () => {
   } else {
     emailData.value.account = emailAccounts.value[0].id
 
-    preloadedContent.value = `<p></p><p></p><p></p>${profileStore.activeProfile.emailSignature}`
+    preloadedContent.value = `<p></p><p></p><p></p>${profileStore.activeProfile.emailSignature || ""}`
 
     //Check Query
     if(route.query.to) emailData.value.to = route.query.to
@@ -194,26 +194,39 @@ const sendEmail = async () => {
             />
           </UFormGroup>
           <UDivider class="my-3"/>
-          <UInput
-              class="w-full my-1"
-              placeholder="Empfänger"
-              v-model="emailData.to"
-          />
-          <UInput
-              class="w-full my-1"
-              placeholder="Kopie"
-              v-model="emailData.cc"
-          />
-          <UInput
-              class="w-full my-1"
-              placeholder="Blindkopie"
-              v-model="emailData.bcc"
-          />
-          <UInput
-              placeholder="Betreff"
-              class="w-full my-1"
-              v-model="emailData.subject"
-          />
+          <UFormGroup
+            label="Empfänger"
+          >
+            <UInput
+                class="w-full my-1"
+                v-model="emailData.to"
+            />
+          </UFormGroup>
+          <UFormGroup
+            label="Kopie"
+          >
+            <UInput
+                class="w-full my-1"
+                v-model="emailData.cc"
+            />
+          </UFormGroup>
+          <UFormGroup
+            label="Blindkopie"
+          >
+            <UInput
+                class="w-full my-1"
+                placeholder=""
+                v-model="emailData.bcc"
+            />
+          </UFormGroup>
+          <UFormGroup
+            label="Betreff"
+          >
+            <UInput
+                class="w-full my-1"
+                v-model="emailData.subject"
+            />
+          </UFormGroup>
         </div>
 
       </UDashboardToolbar>
@@ -248,6 +261,7 @@ const sendEmail = async () => {
         </div>
 
         <Tiptap
+            class="mt-3"
             @updateContent="contentChanged"
             :preloadedContent="preloadedContent"
         />