diff --git a/parser.cpp b/parser.cpp
index 1447f0a..ba3169e 100644
--- a/parser.cpp
+++ b/parser.cpp
@@ -230,6 +230,8 @@ void Parser::parseFiles(QNetworkReply *reply, QMap<QNetworkReply*, Structureelem
             QString title = file["title"].toString();
             QString from = "Anküdigung im L²P";
             int time = file["modifiedTimestamp"].toInt();
+            QString dirname = "Announcement";
+            urlParts.append(dirname);
 
             Structureelement *dir = Utils::getDirectoryItem(currentCourse, urlParts);
 
@@ -276,6 +278,9 @@ void Parser::parseFiles(QNetworkReply *reply, QMap<QNetworkReply*, Structureelem
             QString title = file["subject"].toString();
             QString from = file["from"].toString();
             int time = file["modifiedTimestamp"].toInt();
+            QString dirname = "E-Mails";
+            urlParts.append(dirname);
+
 
             Structureelement *dir = Utils::getDirectoryItem(currentCourse, urlParts);
 
diff --git a/structureelement.cpp b/structureelement.cpp
index c2698ec..d2334b1 100644
--- a/structureelement.cpp
+++ b/structureelement.cpp
@@ -238,7 +238,7 @@ bool Structureelement::operator< (const QStandardItem& other) const
     {
         return false;
     }
-    else if ((typeEX == messageItem))
+    else if (typeEX == messageItem)
     {
         return (data(dateRole) < other.data(dateRole));
     }
diff --git a/utils.cpp b/utils.cpp
index 4c540bc..f187ea7 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -165,15 +165,31 @@ Structureelement *Utils::getDirectoryItem(Structureelement *courseItem, QStringL
                 item = "Übungsdokumente";
             }
             else if (item.contains("EmailAttachments")) {
-                item = "E-Mail-Anhänge";
+                item = "E-Mails";
             }
             else if (item.contains("MediaLibrary")) {
                 item = "Medienbibliothek";
             }
             else if (item.contains("AnnouncementDocuments")) {
-                item = "Ankündigungs-Anhänge";
+                item = "Ankündigungen";
+            }
+            else if (item.contains("Announcement"))
+            {
+                item = "Ankündigungen";
             }
         }
+
+        // Bei anderen Sprachen werden Anhänge zu den Nachrichten gepackt.
+        if(QLocale::system().language() != QLocale::German)
+        {
+            if (item.contains("AnnouncementDocuments")) {
+                item = "Announcement";
+            }
+            else if (item.contains("EmailAttachments")) {
+                item = "E-Mails";
+            }
+        }
+
         bool correctChildFound = false;
         for(int row=0; row < currentItem->rowCount(); ++row)
         {