diff --git a/app/app.go b/app/app.go
index d593e0e..e1e9b65 100644
--- a/app/app.go
+++ b/app/app.go
@@ -239,8 +239,8 @@ func sendAppErrorMail(e *AppError, r *http.Request) {
 	userId, _ := session.Values[sessionConfig.UserIdKey].(int64)
 
 	errorMessage := &mail.Message{
-		Sender:  "RetroGit Admin <digests@retrogit.com>",
-		To:      []string{"mihai.parparita@gmail.com"},
+		Sender:  "RetroGit for samsonjs <digests@retrogit.appspotmail.com>",
+		To:      []string{"sami.samhuri@gmail.com"},
 		Subject: fmt.Sprintf("RetroGit Internal Error on %s", r.URL),
 		Body: fmt.Sprintf(`Request URL: %s
 HTTP status code: %d
diff --git a/app/retrogit.go b/app/retrogit.go
index cec1691..d61d7e8 100644
--- a/app/retrogit.go
+++ b/app/retrogit.go
@@ -283,8 +283,8 @@ func sendDigestErrorMail(e error, c context.Context, gitHubUserId int64) {
 	}
 
 	errorMessage := &mail.Message{
-		Sender:  "RetroGit Admin <digests@retrogit.com>",
-		To:      []string{"mihai.parparita@gmail.com"},
+		Sender:  "RetroGit for samsonjs <digests@retrogit.appspotmail.com>",
+		To:      []string{"sami.samhuri@gmail.com"},
 		Subject: fmt.Sprintf("RetroGit Digest Send Error for %d", gitHubUserId),
 		Body:    fmt.Sprintf("Error: %s", e),
 	}
@@ -327,7 +327,7 @@ func sendDigestForAccount(account *Account, c context.Context) (bool, error) {
 				}
 
 				digestMessage := &mail.Message{
-					Sender:   "RetroGit <digests@retrogit.com>",
+					Sender:   "RetroGit for samsonjs <digests@retrogit.appspotmail.com>",
 					To:       []string{emailAddress},
 					Subject:  "RetroGit Digest Error",
 					HTMLBody: authErrorHtml.String(),
@@ -351,7 +351,7 @@ func sendDigestForAccount(account *Account, c context.Context) (bool, error) {
 	}
 
 	digestMessage := &mail.Message{
-		Sender:   "RetroGit <digests@retrogit.com>",
+		Sender:   "RetroGit for samsonjs <digests@retrogit.appspotmail.com>",
 		To:       []string{emailAddress},
 		Subject:  "RetroGit Digest",
 		HTMLBody: digestHtml.String(),