diff --git a/Changelog.md b/Changelog.md
index da2c396a3..fd450d5b9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,7 @@
 
 ## Refactor
 * Indicate proper way to report bugs in the sidebar [#7039](https://github.com/diaspora/diaspora/pull/7039)
+* Remove text color from notification mails and fix sender avatar [#7054](https://github.com/diaspora/diaspora/pull/7054)
 
 ## Bug fixes
 
diff --git a/app/views/layouts/notifier.html.erb b/app/views/layouts/notifier.html.erb
deleted file mode 100644
index 044b717fd..000000000
--- a/app/views/layouts/notifier.html.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<table cellspacing="0" cellpadding="0" border="0" align="center" width="100%" style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:14px;">
-  <tr width="100%">
-    <% if @notification.try(:sender) %>
-      <td style="vertical-align:top;" width="60px">
-        <div style="background-color:#eee; height:50px; width:50px;">
-          <img alt="<%=@notification.sender%>" src="<%=@notification.sender.profile.image_url(:thumb_small)%>"
-               style="border:0; display:block; top:0; left:0;" height="50px" width="50px">
-        </div>
-      </td>
-    <% end %>
-    <td style="vertical-align:top;">
-      <%= yield %>
-    </td>
-  </tr>
-</table>
-
-<table cellspacing="0" cellpadding="0" border="0" align="center" width="100%" style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:12px;color:#999; padding-top:10px; margin-top:10px; border-top: 1px solid #ddd;">
-  <tr>
-    <td>
-      <%= t("notifier.email_sent_by_diaspora", pod_name: pod_name) %>
-      <a href="<%=edit_user_url%>">
-        <%= t("notifier.click_here") %>
-      </a>
-      <%=t("notifier.to_change_your_notification_settings")%>.
-    </td>
-  </tr>
-</table>
diff --git a/app/views/layouts/notifier.html.haml b/app/views/layouts/notifier.html.haml
new file mode 100644
index 000000000..8e18a337a
--- /dev/null
+++ b/app/views/layouts/notifier.html.haml
@@ -0,0 +1,15 @@
+%table{cellspacing: 0, cellpadding: 0, border: 0,
+       style: "font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px"}
+  %tr
+    - if @notification.try(:sender)
+      %td{width: "60px", style: "vertical-align: top"}>
+        %div{style: "background-color: #eee; height: 50px; width: 50px"}
+          = image_tag @notification.sender.profile.image_url(:thumb_small), alt: @notification.sender.name,
+                      style: "border: 0, display: block; top: 0; left: 0", height: "50px", width: "50px"
+    %td{style: "vertical-align: top"}
+      != yield
+
+%div{style: "font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; color: #999; padding-top: 10px; margin-top: 10px; border-top: 1px solid #ddd"}
+  != t("notifier.email_sent_by_diaspora", pod_name: pod_name)
+  != link_to t("notifier.click_here"), edit_user_url
+  != t("notifier.to_change_your_notification_settings") + "."