diff --git a/lib/Search/profile_company.dart b/lib/Search/profile_company.dart
index 5cba5c1..97f5383 100644
--- a/lib/Search/profile_company.dart
+++ b/lib/Search/profile_company.dart
@@ -42,7 +42,6 @@ class _ProfileScreenState extends State<ProfileScreen> {
 
   void _sendEmail() async {
     {
-      //TODO Mail senden funktioniert noch nicht
       final Uri params = Uri(
         scheme: "mailto",
         path: email,
diff --git a/lib/Widgets/all_companies_widget.dart b/lib/Widgets/all_companies_widget.dart
index a3e5db5..f68248e 100644
--- a/lib/Widgets/all_companies_widget.dart
+++ b/lib/Widgets/all_companies_widget.dart
@@ -23,14 +23,15 @@ class AllWorkersWidget extends StatefulWidget {
 
 class _AllWorkersWidgetState extends State<AllWorkersWidget> {
   void _mailTo() async {
-    var mailUrl = "mailto: ${widget.userEmail}";
-    print("widget.userEmail ${widget.userEmail}");
-
-    if (await canLaunchUrlString(mailUrl)) {
-      await launchUrlString(mailUrl);
-    } else {
-      print("error");
-      throw "Error Occured";
+    {
+      final Uri params = Uri(
+        scheme: "mailto",
+        path: widget.userEmail,
+        query:
+        "subject=Hey from JobFinder",
+      );
+      final url = params.toString();
+      launchUrlString(url);
     }
   }
 
diff --git a/lib/jobs/job_details.dart b/lib/jobs/job_details.dart
index 3fd98be..1ee1529 100644
--- a/lib/jobs/job_details.dart
+++ b/lib/jobs/job_details.dart
@@ -102,16 +102,15 @@ class _JobDetailsScreenState extends State<JobDetailsScreen> {
   }
 
   applyForJob() {
-    //TODO Mail senden funktioniert noch nicht
-    final Uri params = Uri(
-      scheme: "mailto",
-      path: emailCompany,
-      query:
-          "subject=Applying for $jobTitle&body=Hello, please attach Resume CV file",
-    );
-    final url = params.toString();
-    launchUrlString(url);
-    addNewApplicants();
+        final Uri params = Uri(
+        scheme: "mailto",
+        path: emailCompany,
+        query:
+        "subject=Hey from JobFinder",
+      );
+      final url = params.toString();
+      launchUrlString(url);
+
   }
 
   void addNewApplicants() async {