diff --git a/domain/mail/document-approver.html b/domain/mail/document-approver.html
index 037ff72a..cf2f2ed3 100644
--- a/domain/mail/document-approver.html
+++ b/domain/mail/document-approver.html
@@ -81,7 +81,7 @@ background-color: #f6f6f6;
                                 </tr>
                                 <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0; padding: 0;">
                                     <td class="content-block" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px; color: #7a8184;" valign="top">
-                                        Have any questions? <a href="mailto:team@documize.com" style="color: #7a8184;">Contact Documize</a>
+                                        Have any questions? <a href="mailto:{{.SenderEmail}}" style="color: #7a8184;">Contact Us</a>
                                     </td>
                                 </tr>
                             </table>
diff --git a/domain/mail/document.go b/domain/mail/document.go
index 39bed8e1..222e2326 100644
--- a/domain/mail/document.go
+++ b/domain/mail/document.go
@@ -37,15 +37,17 @@ func (m *Mailer) DocumentApprover(recipient, inviterName, inviterEmail, url, doc
 	em.ReplyName = inviterName
 
 	parameters := struct {
-		Subject  string
-		Inviter  string
-		URL      string
-		Document string
+		Subject     string
+		Inviter     string
+		URL         string
+		Document    string
+		SenderEmail string
 	}{
 		em.Subject,
 		inviterName,
 		url,
 		document,
+		m.Config.SenderEmail,
 	}
 
 	html, err := m.ParseTemplate("mail/document-approver.html", parameters)
diff --git a/domain/mail/email.html b/domain/mail/email.html
index c3e17db8..6fd9f862 100644
--- a/domain/mail/email.html
+++ b/domain/mail/email.html
@@ -89,10 +89,10 @@ background-color: #f6f6f6;
 									<td class="content-block" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
 										<a href="{{.Url}}" class="btn-primary" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; color: #FFF; text-decoration: none; line-height: 2; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 5px; background: #4ccb6a; margin: 0; padding: 0; border-color: #4ccb6a; border-style: solid; border-width: 10px 20px;">Click here to access Documize</a>
 									</td>
-								</tr>								
+								</tr>
 								<tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0; padding: 0;">
 									<td class="content-block" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px; color: #7a8184;" valign="top">
-										Have any questions? <a href="mailto:team@documize.com" style="color: #7a8184;">Contact Documize</a>
+                                        Have any questions? <a href="mailto:{{.SenderEmail}}" style="color: #7a8184;">Contact Us</a>
 									</td>
 								</tr>
 							</table>
@@ -106,4 +106,4 @@ background-color: #f6f6f6;
 </table>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/domain/mail/invite-existing-user.html b/domain/mail/invite-existing-user.html
index 55d58901..9461c547 100644
--- a/domain/mail/invite-existing-user.html
+++ b/domain/mail/invite-existing-user.html
@@ -77,7 +77,7 @@ background-color: #f6f6f6;
                                 </tr>
                                 <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0; padding: 0;">
                                     <td class="content-block" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px; color: #7a8184;" valign="top">
-                                        Have any questions? <a href="mailto:team@documize.com" style="color: #7a8184;">Contact Documize</a>
+                                        Have any questions? <a href="mailto:{{.SenderEmail}}" style="color: #7a8184;">Contact Us</a>
                                     </td>
                                 </tr>
                             </table>
diff --git a/domain/mail/invite-new-user.html b/domain/mail/invite-new-user.html
index c14cfee0..ead957e2 100644
--- a/domain/mail/invite-new-user.html
+++ b/domain/mail/invite-new-user.html
@@ -87,7 +87,7 @@ background-color: #f6f6f6;
                                 </tr>
                                 <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0; padding: 0;">
                                     <td class="content-block" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px; color: #7a8184;" valign="top">
-                                        Have any questions? <a href="mailto:team@documize.com" style="color: #7a8184;">Contact Documize</a>
+                                        Have any questions? <a href="mailto:{{.SenderEmail}}" style="color: #7a8184;">Contact Us</a>
                                     </td>
                                 </tr>
                             </table>
diff --git a/domain/mail/password-reset.html b/domain/mail/password-reset.html
index 19c306c2..5e0b727c 100644
--- a/domain/mail/password-reset.html
+++ b/domain/mail/password-reset.html
@@ -84,7 +84,7 @@ background-color: #f6f6f6;
                                 </tr>
                                 <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0; padding: 0;">
                                     <td class="content-block" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px; color: #7a8184;" valign="top">
-                                        Have any questions? <a href="mailto:team@documize.com" style="color: #7a8184;">Contact Documize</a>
+                                        Have any questions? <a href="mailto:{{.SenderEmail}}" style="color: #7a8184;">Contact Us</a>
                                     </td>
                                 </tr>
                             </table>
@@ -98,4 +98,4 @@ background-color: #f6f6f6;
 </table>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/domain/mail/share-space-existing-user.html b/domain/mail/share-space-existing-user.html
index 2c14a106..c4f4466c 100644
--- a/domain/mail/share-space-existing-user.html
+++ b/domain/mail/share-space-existing-user.html
@@ -80,7 +80,7 @@ background-color: #f6f6f6;
                                 </tr>
                                 <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0; padding: 0;">
                                     <td class="content-block" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px; color: #7a8184;" valign="top">
-                                        Have any questions? <a href="mailto:team@documize.com" style="color: #7a8184;">Contact Documize</a>
+                                        Have any questions? <a href="mailto:{{.SenderEmail}}" style="color: #7a8184;">Contact Us</a>
                                     </td>
                                 </tr>
                             </table>
diff --git a/domain/mail/space.go b/domain/mail/space.go
index 230c3ffd..87692339 100644
--- a/domain/mail/space.go
+++ b/domain/mail/space.go
@@ -35,17 +35,19 @@ func (m *Mailer) ShareSpaceExistingUser(recipient, inviterName, inviterEmail, ur
 	em.ReplyName = inviterName
 
 	parameters := struct {
-		Subject string
-		Inviter string
-		URL     string
-		Folder  string
-		Intro   string
+		Subject     string
+		Inviter     string
+		URL         string
+		Folder      string
+		Intro       string
+		SenderEmail string
 	}{
 		em.Subject,
 		inviterName,
 		url,
 		folder,
 		intro,
+		m.Config.SenderEmail,
 	}
 
 	html, err := m.ParseTemplate("mail/share-space-existing-user.html", parameters)
@@ -82,17 +84,19 @@ func (m *Mailer) ShareSpaceNewUser(recipient, inviterName, inviterEmail, url, sp
 	em.ReplyName = inviterName
 
 	parameters := struct {
-		Subject    string
-		Inviter    string
-		URL        string
-		Invitation string
-		Folder     string
+		Subject     string
+		Inviter     string
+		URL         string
+		Invitation  string
+		Folder      string
+		SenderEmail string
 	}{
 		em.Subject,
 		inviterName,
 		url,
 		invitationMessage,
 		space,
+		m.Config.SenderEmail,
 	}
 
 	html, err := m.ParseTemplate("mail/share-space-new-user.html", parameters)
diff --git a/domain/mail/user.go b/domain/mail/user.go
index 03a519e1..445879aa 100644
--- a/domain/mail/user.go
+++ b/domain/mail/user.go
@@ -35,17 +35,19 @@ func (m *Mailer) InviteNewUser(recipient, inviterName, inviterEmail, url, userna
 	em.ReplyName = inviterName
 
 	parameters := struct {
-		Subject  string
-		Inviter  string
-		URL      string
-		Username string
-		Password string
+		Subject     string
+		Inviter     string
+		URL         string
+		Username    string
+		Password    string
+		SenderEmail string
 	}{
 		em.Subject,
 		inviterName,
 		url,
 		recipient,
 		password,
+		m.Config.SenderEmail,
 	}
 
 	html, err := m.ParseTemplate("mail/invite-new-user.html", parameters)
@@ -82,13 +84,15 @@ func (m *Mailer) InviteExistingUser(recipient, inviterName, inviterEmail, url st
 	em.ReplyName = inviterName
 
 	parameters := struct {
-		Subject string
-		Inviter string
-		URL     string
+		Subject     string
+		Inviter     string
+		URL         string
+		SenderEmail string
 	}{
 		em.Subject,
 		inviterName,
 		url,
+		m.Config.SenderEmail,
 	}
 
 	html, err := m.ParseTemplate("mail/invite-existing-user.html", parameters)
@@ -118,11 +122,13 @@ func (m *Mailer) PasswordReset(recipient, url string) {
 	em.ToName = recipient
 
 	parameters := struct {
-		Subject string
-		URL     string
+		Subject     string
+		URL         string
+		SenderEmail string
 	}{
 		em.Subject,
 		url,
+		m.Config.SenderEmail,
 	}
 
 	html, err := m.ParseTemplate("mail/password-reset.html", parameters)