diff --git a/NEWS b/NEWS
index eb19dccd3..c53625ba3 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,7 @@ Bug fixes
  - [web] handle empty body data when forwarding mails (#3581)
  - [eas] correctly set EAS message class for S/MIME messages (#3576)
  - [web] show repeating events when we ask for "All" or "Future" events (#69)
+ - [web] show the To instead of From when we are in the Sent folder (#3547)
 
 3.0.2 (2016-03-04)
 ------------------
diff --git a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
index e5e307dd9..ca99febd0 100644
--- a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
@@ -272,7 +272,7 @@
                  ng-switch="currentMessage.selected">
               <sg-avatar-image class="md-avatar"
                                ng-switch-when="false"
-                               sg-email="currentMessage.from[0].email"
+                               sg-email="mailbox.service.selectedFolder.type == 'sent' ? currentMessage.to[0].email : currentMessage.from[0].email"
                                size="40"><!-- avatar --></sg-avatar-image>
               <div class="md-avatar sg-avatar-selected"
                    ng-switch-when="true"><!-- selected avatar --></div>
@@ -289,7 +289,7 @@
                            ng-show="currentMessage.priority.level == 1 ||
                                     currentMessage.priority.level == 2"
                            ng-class="{'md-warn': currentMessage.priority.level == 1}">error</md-icon>
-                  {{currentMessage.$shortAddress('from')}}
+                  {{mailbox.service.selectedFolder.type == 'sent' ? currentMessage.$shortAddress('to' ) : currentMessage.$shortAddress('from' )}}
                 </div>
                 <div class="sg-tile-date" ng-bind="currentMessage.relativedate"><!-- date --></div>
               </div>