From c76a392abf8a573acf25102c9cfd0d056e574af1 Mon Sep 17 00:00:00 2001
From: Tankred Hase <tankred@whiteout.io>
Date: Mon, 18 May 2015 15:56:31 +0200
Subject: [PATCH 1/2] [WO-03-011] Fix no Reliable Sender Indication is
 implemented (Medium) Display sender email address next to full name

---
 src/sass/blocks/views/_read.scss | 3 +++
 src/tpl/read.html                | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/sass/blocks/views/_read.scss b/src/sass/blocks/views/_read.scss
index a34384c..48cc9c3 100644
--- a/src/sass/blocks/views/_read.scss
+++ b/src/sass/blocks/views/_read.scss
@@ -191,6 +191,9 @@
             .mail-addresses__stripped {
                 display: inline;
             }
+            .read__sender-address {
+                display: none;
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/src/tpl/read.html b/src/tpl/read.html
index 6da7c4b..dc24904 100644
--- a/src/tpl/read.html
+++ b/src/tpl/read.html
@@ -75,7 +75,7 @@
           <label>From:</label>
           <span ng-repeat="u in state.mailList.selected.from">
             <span class="label" ng-class="{'label--invalid': u.secure === false, 'label--invalid-clickable': u.secure === false}" ng-mouseover="getKeyId(u.address)" wo-touch="invite(u)" wo-tooltip="#fingerprint-info">
-              {{u.name || u.address}}
+              {{u.name || u.address}} <span ng-show="u.name" ng-class="{'read__sender-address': !notStripped}">&#60; {{u.address}} &#62;</span>
               <svg ng-show="u.secure === false"><use xlink:href="#icon-add_contact" /></svg>
             </span>
 

From e7cbf9ed86a457c531c5767be207b31d1e41ac5f Mon Sep 17 00:00:00 2001
From: Tankred Hase <tankred@whiteout.io>
Date: Mon, 18 May 2015 16:14:12 +0200
Subject: [PATCH 2/2] Fix browserify build

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index c5ff043..06f0eb9 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "grunt": "~0.4.1",
     "grunt-angular-templates": "~0.5.7",
     "grunt-autoprefixer": "~0.7.2",
-    "grunt-browserify": "^3.0.1",
+    "grunt-browserify": "~3.7.0",
     "grunt-contrib-clean": "~0.5.0",
     "grunt-contrib-compress": "~0.5.2",
     "grunt-contrib-concat": "^0.5.0",
@@ -79,4 +79,4 @@
     "time-grunt": "^1.0.0",
     "wo-smtpclient": "~0.6.0"
   }
-}
+}
\ No newline at end of file