diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..d98d161
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,7 @@
+test:
+	go test ./...
+
+deploy:
+	go build -o gte-process-inbox ./cmd/process-inbox/main.go
+	go build -o gte-generate-recurring ./cmd/generate-recurring/main.go
+	scp gte-* zerocontent.org:bin/
diff --git a/internal/task/task.go b/internal/task/task.go
index f3ce461..b4df770 100644
--- a/internal/task/task.go
+++ b/internal/task/task.go
@@ -293,7 +293,7 @@ func FieldFromBody(field, body string) (string, bool) {
 		fieldName := strings.ToLower(strings.TrimSpace(parts[0]))
 		if fieldName == field {
 			if value == "" {
-				value = strings.TrimSpace(parts[1])
+				value = lowerAndTrim(parts[1])
 			} else {
 				dirty = true
 			}
@@ -309,17 +309,17 @@ func FieldFromSubject(field, subject string) string {
 	terms := strings.Split(subject, SUBJECT_SEPARATOR)
 	switch field {
 	case FIELD_ACTION:
-		return terms[len(terms)-1]
+		return lowerAndTrim(terms[len(terms)-1])
 	case FIELD_PROJECT:
 		if len(terms) < 2 {
 			return ""
 		}
-		return terms[len(terms)-2]
+		return lowerAndTrim(terms[len(terms)-2])
 	case FIELD_DUE:
 		if len(terms) < 3 {
 			return ""
 		}
-		return terms[len(terms)-3]
+		return lowerAndTrim(terms[len(terms)-3])
 	}
 
 	return ""
diff --git a/pkg/mstore/imap.go b/pkg/mstore/imap.go
index 5de8db2..d61d022 100644
--- a/pkg/mstore/imap.go
+++ b/pkg/mstore/imap.go
@@ -176,10 +176,11 @@ func (es *Imap) Messages(folder string) ([]*Message, error) {
 }
 
 func (es *Imap) Add(folder, subject, body string) error {
-	msgStr := fmt.Sprintf(`From: todo <process@erikwinter.nl>
+	msgStr := fmt.Sprintf(`From: todo <mstore@erikwinter.nl>
+Date: %s
 Subject: %s
 
-%s`, subject, body)
+%s`, time.Now().Format(time.RFC822), subject, body)
 
 	msg := NewBody(msgStr)