diff --git a/app/Http/Controllers/MailController.php b/app/Http/Controllers/MailController.php
index 9ff576a5a96eb04d008ad48d782eb0bf69d12ee5..11f493491bde6ba39db91a8c2fb48abb808673f1 100644
--- a/app/Http/Controllers/MailController.php
+++ b/app/Http/Controllers/MailController.php
@@ -123,16 +123,17 @@ class MailController extends Controller
 
     public function sendLanguageFile(Request $request, $from, $to, $exclude = "")
     {
-
         $filename = $request->input('filename');
 
         # Wir erstellen nun zunächst den Inhalt der Datei:
         $data = [];
         $new  = 0;
         foreach ($request->all() as $key => $value) {
+
             if ($key === "filename" || $value === "") {
                 continue;
             }
+            $key = base64_decode($key);
             if (strpos($key, "_new_") === 0 && $value !== "") {
                 $new++;
                 $key = substr($key, strpos($key, "_new_") + 5);
@@ -151,6 +152,7 @@ class MailController extends Controller
             }
 
         }
+
         $output = json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE);
         $output = preg_replace("/\{/si", "[", $output);
         $output = preg_replace("/\}/si", "]", $output);
diff --git a/resources/views/languages/edit.blade.php b/resources/views/languages/edit.blade.php
index f31918f2b220e3cf8a7c17ca0253e9b0ae84d607..6ce0b597580af03160bf947d81646fa70c126289 100644
--- a/resources/views/languages/edit.blade.php
+++ b/resources/views/languages/edit.blade.php
@@ -37,13 +37,12 @@
 		@else
 		<tr>
 			<td class="name">{{preg_replace("/(\s*).*#(.*)$/si", "$1$2", $name)}}</td>
-			<td>@if(isset($langValues[$to])) <textarea type="text" rows="1" cols="50" form="submit" name="{{$name}}" readonly >{{$langValues[$to]}}</textarea> @else <textarea rows="1" cols="50" form="submit" name="_new_{{$name}}" ></textarea> @endif</td>
+			<td>@if(isset($langValues[$to])) <textarea type="text" rows="1" cols="50" form="submit" name="{{ base64_encode($name) }}" readonly >{{$langValues[$to]}}</textarea> @else <textarea rows="1" cols="50" form="submit" name="{{base64_encode("_new_" . $name)}}" ></textarea> @endif</td>
 			@foreach($langs as $lang => $value)
 			<td>{!! $langValues[$lang] or "" !!}</td>
 			@endforeach
 		</tr>
 		@endif
-
 		@endforeach
 	</tbody>
 </table>