diff --git a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
index ff3a8cabc..dcc933fae 100644
--- a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
@@ -11,12 +11,13 @@
     <header class="sg-md-subheader">
       <h2 class="sg-md-subhead-solo fg-sogoBlue-700">Unread Messages</h2>
     </header>
-
     <md-list vs-repeat="72"
         vs-scroll-parent="#messagesList">
-      <md-list-item ng-repeat="currentMessage in mailbox.$messages track by currentMessage.id"
+      <md-list-item
+          class="md-clickable"
+          ng-repeat="currentMessage in mailbox.$messages track by currentMessage.id"
           ng-class="{unread: !currentMessage.isread}">
-        <div ui-sref-active="_selected" layout="row">
+        <md-item-content ui-sref-active="_selected" layout="row">
           <div class="sg-avatar">
             <!--avatar-->
           </div>
@@ -36,7 +37,7 @@
             <i class="md-icon-flag" ng-show="currentMessage.isflagged"> </i>
             <i class="md-icon-attach-file disable" ng-show="currentMessage.hasattachment"> </i>
           </div>
-        </div>
+        </md-item-content>
       </md-list-item>
     </md-list>
   </md-content>