diff --git a/internal/task/task.go b/internal/task/task.go
index 3627083..0efa604 100644
--- a/internal/task/task.go
+++ b/internal/task/task.go
@@ -16,11 +16,11 @@ var (
 )
 
 const (
-	FOLDER_INBOX     = "INBOX"
-	FOLDER_NEW       = "New"
-	FOLDER_RECURRING = "Recurring"
-	FOLDER_PLANNED   = "Planned"
-	FOLDER_UNPLANNED = "Unplanned"
+	FOLDER_INBOX     = "GTE/In"
+	FOLDER_NEW       = "GTE/New"
+	FOLDER_RECURRING = "GTE/Recurring"
+	FOLDER_PLANNED   = "GTE/Planned"
+	FOLDER_UNPLANNED = "GTE/Unplanned"
 
 	QUOTE_PREFIX       = ">"
 	PREVIOUS_SEPARATOR = "Previous version:"
diff --git a/pkg/mstore/imap.go b/pkg/mstore/imap.go
index 49d69b5..b0db4c2 100644
--- a/pkg/mstore/imap.go
+++ b/pkg/mstore/imap.go
@@ -236,7 +236,7 @@ func (im *IMAP) Add(folder, subject, body string) error {
 	defer im.Close()
 
 	msgStr := fmt.Sprintf("From: %s\r\nDate: %s\r\nSubject: %s\r\n\r\n%s\r\n",
-		"gte <gte@gettingthings.email>",
+		"gte <gte@ewintr.nl>",
 		time.Now().Format(time.RFC822Z),
 		subject,
 		body,