diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index d44d0faeb..85d9d2763 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -341,7 +341,8 @@ export default {
 		<bs-modal
 			class="messages-detail-newmessage-modal"
 			ref="modalNewMessage" 
-			dialog-class="modal-xl"
+			dialog-class=" modal-dialog-scrollable modal-xl"
+			body-class="px-3 py-2"
 			@hidden.bs.modal="resetForm"
 			>
 
@@ -350,10 +351,6 @@ export default {
 			</template>
 
 			<form-form ref="formNewMassage">
-
-				<div class="overflow-auto" style="max-height: 500px; border: 1px solid #ccc;">
-
-
 				<div class="row">
 					<div class="col-sm-8">
 						<form-form class="row g-3 mt-2" ref="formMessage">
@@ -410,60 +407,56 @@ export default {
 					<div class="col-sm-4">
 						<div v-if="this.fieldsPrestudent.length > 0">
 							<strong>{{$p.t('ui', 'felder')}} {{$p.t('lehre', 'prestudent')}}</strong>
-							<div class="border p-3 overflow-auto" style="height: 200px;">
 
-								<list-box
-									v-model="selectedFieldPrestudent"
-									:options="itemsPrestudent"
-									optionLabel="label"
-								>
-								  <template #option="slotProps">
-									<div @dblclick="insertVariable(slotProps.option)">
-									  {{ slotProps.option.label }}
-									</div>
-								  </template>
-								</list-box>
-
-							</div>
+							<list-box
+								v-model="selectedFieldPrestudent"
+								:options="itemsPrestudent"
+								optionLabel="label"
+								listStyle="max-height:200px"
+							>
+							  <template #option="slotProps">
+								<div @dblclick="insertVariable(slotProps.option)">
+								  {{ slotProps.option.label }}
+								</div>
+							  </template>
+							</list-box>
 
 						</div>
 
 						<div v-if="this.fieldsPerson.length > 0">
 							<strong>Felder Person</strong>
-							<div class="border p-3 overflow-auto" style="height: 200px;">
 
-								<list-box
-									v-model="selectedFieldPerson"
-									:options="itemsPerson"
-									optionLabel="label"
-								>
-									<template #option="slotProps">
-										<div @dblclick="insertVariable(slotProps.option)">
-										  {{ slotProps.option.label }}
-										</div>
-								  </template>
-								</list-box>
+							<list-box
+								v-model="selectedFieldPerson"
+								:options="itemsPerson"
+								optionLabel="label"
+								listStyle="max-height:200px"
+							>
+								<template #option="slotProps">
+									<div @dblclick="insertVariable(slotProps.option)">
+									  {{ slotProps.option.label }}
+									</div>
+							  </template>
+							</list-box>
 
-							</div>
 						</div>
 
 						<div>
 							<strong>{{$p.t('messages', 'meineFelder')}}</strong>
-							<div class="border p-3 overflow-auto" style="height: 200px;">
 
-								<list-box
-									v-model="selectedFieldUser"
-									:options="itemsUser"
-									optionLabel="label"
-								>
-									<template #option="slotProps">
-										<div @dblclick="insertVariable(slotProps.option)">
-										  {{ slotProps.option.label }}
-										</div>
-								  </template>
-								</list-box>
+							<list-box
+								v-model="selectedFieldUser"
+								:options="itemsUser"
+								optionLabel="label"
+								listStyle="max-height:200px"
+							>
+								<template #option="slotProps">
+									<div @dblclick="insertVariable(slotProps.option)">
+									  {{ slotProps.option.label }}
+									</div>
+							  </template>
+							</list-box>
 
-							</div>
 						</div>
 
 					</div>
@@ -508,9 +501,6 @@ export default {
 					</div>
 
 				</div>
-
-			</div>
-
 			</form-form>
 
 			<template #footer>
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index fbf7bd9d7..d070ff379 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -402,21 +402,19 @@ export default {
 					<div class="col-sm-4">
 						<div v-if="this.fieldsPrestudent.length > 0"  class="mt-3">
 							<strong>{{$p.t('ui', 'felder')}} {{$p.t('lehre', 'prestudent')}}</strong>
-							<div class="border p-3 overflow-auto" style="height: 250px;">
 
-								<list-box
-									v-model="selectedFieldPrestudent"
-									:options="itemsPrestudent"
-									optionLabel="label"
-								>
-								  <template #option="slotProps">
-									<div @dblclick="insertVariable(slotProps.option)">
-									  {{ slotProps.option.label }}
-									</div>
-								  </template>
-								</list-box>
-
-							</div>
+							<list-box
+								v-model="selectedFieldPrestudent"
+								:options="itemsPrestudent"
+								optionLabel="label"
+								listStyle="max-height:250px"
+							>
+							  <template #option="slotProps">
+								<div @dblclick="insertVariable(slotProps.option)">
+								  {{ slotProps.option.label }}
+								</div>
+							  </template>
+							</list-box>
 
 						</div>
 
@@ -424,41 +422,37 @@ export default {
 
 						<div v-if="this.fieldsPerson.length > 0" class="mt-3">
 							<strong>Felder Person</strong>
-							<div class="border p-3 overflow-auto" style="height: 250px;">
 
-								<list-box
-									v-model="selectedFieldPerson"
-									:options="itemsPerson"
-									optionLabel="label"
-								>
-									<template #option="slotProps">
-										<div @dblclick="insertVariable(slotProps.option)">
-										  {{ slotProps.option.label }}
-										</div>
-								  </template>
-								</list-box>
-
-							</div>
+							<list-box
+								v-model="selectedFieldPerson"
+								:options="itemsPerson"
+								optionLabel="label"
+								listStyle="max-height:250px"
+							>
+								<template #option="slotProps">
+									<div @dblclick="insertVariable(slotProps.option)">
+									  {{ slotProps.option.label }}
+									</div>
+							  </template>
+							</list-box>
 
 						</div>
 
 						<div>
 							<strong>{{$p.t('messages', 'meineFelder')}}</strong>
-							<div class="border p-3 overflow-auto" style="height: 200px;">
 
-								<list-box
-									v-model="selectedFieldUser"
-									:options="itemsUser"
-									optionLabel="label"
-								>
-									<template #option="slotProps">
-										<div @dblclick="insertVariable(slotProps.option)">
-										  {{ slotProps.option.label }}
-										</div>
-								  </template>
-								</list-box>
-
-							</div>
+							<list-box
+								v-model="selectedFieldUser"
+								:options="itemsUser"
+								optionLabel="label"
+								listStyle="max-height:200px"
+							>
+								<template #option="slotProps">
+									<div @dblclick="insertVariable(slotProps.option)">
+									  {{ slotProps.option.label }}
+									</div>
+							  </template>
+							</list-box>
 
 						</div>
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
index 0c46a6333..49600fe20 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
@@ -11,42 +11,6 @@ export default {
 	template: `
 	<div class="stv-details-messages h-100 pb-3 overflow-hidden">
 	
-	<!--TODO(Manu) Delete Testdata-->
-	
-<!--		<h3>Test Dominik Schneider</h3>
-		<core-messages
-			ref="formc"
-			endpoint="$fhcApi.factory.messages.person"
-			type-id="mitarbeiter_uid"
-			id="ma0130"
-			messageLayout="twoColumnsTableLeft"
-			show-table
-			open-mode="modal"
-			>
-		</core-messages>-->
-		
-<!--		<h3>Test Person fields</h3>
-		<core-messages
-			ref="formc"
-			endpoint="$fhcApi.factory.messages.person"
-			type-id="mitarbeiter_uid"
-			id="ma0158"
-			messageLayout="twoColumnsTableLeft"
-			show-table
-			open-mode="newTab"
-			>
-		</core-messages>-->
-		
-<!--		<h3>Test no table</h3>
-		<core-messages
-			ref="form2"
-			endpoint="$fhcApi.factory.messages.person"
-			type-id="prestudent_id"
-			:id="modelValue.prestudent_id"
-			open-mode="modal"
-			>
-		</core-messages>-->
-		
 	<template v-if="modelValue.prestudent_id">
 		<core-messages
 			ref="formc"
@@ -63,7 +27,6 @@ export default {
 		 <h3><strong>No valid prestudent_id!</strong></h3>
 		 <p>{{modelValue.anmerkungen}}</p>
 	</template>
-	
 
 	</div>
 	`
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index ed81f8e91..bdb9732fb 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -283,19 +283,15 @@ export default {
 	},
 	computed: {
 		countsToHTML: function() {
-			return this.$p.t('global/anzahl')
-				+ ' ('
-				+ this.$p.t('global/ausgewaehlt')
-				+ ' / '
+			return this.$p.t('global/ausgewaehlt')
+				+ ': <strong>' + (this.selectedcount || 0) + '</strong>'
+				+ ' | '
 				+ this.$p.t('global/gefiltert')
-				+ ' / '
-				+ this.$p.t('global/gesamt')
-				+ '): '
-				+ '<strong>' + (this.selectedcount || 0) + '</strong>'
-				+ ' / '
+				+ ': '
 				+ '<strong>' + (this.filteredcount || 0) + '</strong>'
-				+ ' / '
-				+ '<strong>' + (this.count || 0) + '</strong>';
+				+ ' | '
+				+ this.$p.t('global/gesamt')
+				+ ': <strong>' + (this.count || 0) + '</strong>';
 		}
 	},
 	// TODO(chris): focusin, focusout, keydown and tabindex should be in the filter component
diff --git a/public/js/components/VorlagenDropdown/VorlagenDropdown.js b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
index 03d8564d6..b9869270a 100644
--- a/public/js/components/VorlagenDropdown/VorlagenDropdown.js
+++ b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
@@ -13,14 +13,6 @@ export default {
 			type: String,
 			required: true
 		},
-		modelValue: {
-			type: String,
-			required: true
-		},
-/*		oe: {
-			type: Array,
-			required: false
-		}, */
 		isAdmin: {
 			type: Boolean,
 			required: false