diff --git a/include/emailinbox.php b/include/emailinbox.php
index 7a7372d..6e1e8de 100644
--- a/include/emailinbox.php
+++ b/include/emailinbox.php
@@ -55,7 +55,7 @@ class Emailinbox extends Renderer {
         array_walk($headers, function(&$item, $key) {
             $newItem = '<tr>';
             $newItem .= '<td style="white-space:nowrap">' . ($item['date'] === false ? '' : $item['date']->format('d.m.Y H:i:s')) . '</td>';
-            $newItem .= '<td><a href="mail?folder=' . $this->folder . '&uid=' . $key . '">' . ($item['unread'] === 'U' ? '<b>' : '') . $item['title'] . ($item['unread'] === 'u' ? '</b>' : '') . '</td>';
+            $newItem .= '<td><a href="mail?folder=' . urlencode($this->folder) . '&uid=' . $key . '">' . ($item['unread'] === 'U' ? '<b>' : '') . $item['title'] . ($item['unread'] === 'u' ? '</b>' : '') . '</td>';
             $newItem .= '<td>' . $item['from'] . '</td>';
             $newItem .= '</tr>';
             $item = $newItem;
diff --git a/include/mail.php b/include/mail.php
index 2053768..4eb165c 100644
--- a/include/mail.php
+++ b/include/mail.php
@@ -15,7 +15,7 @@ class Mail extends Mailhandling {
         }
         $params = $this->getUriParams();
         $this->uid = $params['uid'];
-        $this->folder = $params['folder'];
+        $this->folder = url_decode($params['folder']);
         $this->content['uid'] = $this->uid;
     }
     
diff --git a/include/mailhandling.php b/include/mailhandling.php
index 865968f..0dfbd1f 100644
--- a/include/mailhandling.php
+++ b/include/mailhandling.php
@@ -12,9 +12,10 @@ class Mailhandling extends Renderer {
     }
     
     protected function fetchEmail(): PhpImap\IncomingMail {
-        $mailsIds = $this->mbox->searchMailbox('ALL');
+        $mailsIds = $this->mbox->searchMailbox($this->folder);
         if (!in_array($this->uid, $mailsIds)) {
             echo 'nicht auffindbar';
+            var_dump($this->folder, $this->uid);
             die;
         }
         $mail = $this->mbox->getMail($this->uid);