diff --git a/cps/helper.py b/cps/helper.py
index 9aa3d884..3c7c80a6 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -109,7 +109,7 @@ def send_registration_mail(e_mail, user_name, default_password, resend=False):
     text += "Sincerely\r\n\r\n"
     text += "Your Calibre-Web team"
     global_WorkerThread.add_email(_(u'Get Started with Calibre-Web'),None, None, ub.get_mail_settings(),
-                                  e_mail, user_name, _(u"Registration e-mail for user: %(name)s", name=user_name),text)
+                                  e_mail, user_name, _(u"Registration e-mail for user: %(name)s", name=user_name), text)
     return
 
 
@@ -145,7 +145,8 @@ def send_mail(book_id, kindle_mail, calibrepath, user_id):
         return _(u"Could not find any formats suitable for sending by e-mail")
     if result:
         global_WorkerThread.add_email(_(u"Send to Kindle"), book.path, result, ub.get_mail_settings(),
-                                      kindle_mail, user_id, _(u"E-mail: %(book)s", book=book.title))
+                                      kindle_mail, user_id, _(u"E-mail: %(book)s", book=book.title),
+                                      _(u'This e-mail has been sent via Calibre-Web.'))
     else:
         return _(u"The requested file could not be read. Maybe wrong permissions?")
 
diff --git a/cps/templates/author.html b/cps/templates/author.html
index 78ddc8bb..14dd94ed 100644
--- a/cps/templates/author.html
+++ b/cps/templates/author.html
@@ -36,7 +36,9 @@
         </a>
       </div>
       <div class="meta">
-        <p class="title">{{entry.title|shortentitle}}</p>
+        <a href="{{ url_for('show_book', book_id=entry.id) }}">
+          <p class="title">{{entry.title|shortentitle}}</p>
+        </a>
         <p class="author">
           {% for author in entry.authors %}
           <a href="{{url_for('author', book_id=author.id) }}">{{author.name.replace('|',',')}}</a>
diff --git a/cps/templates/discover.html b/cps/templates/discover.html
index 3466597c..13dacb43 100644
--- a/cps/templates/discover.html
+++ b/cps/templates/discover.html
@@ -14,7 +14,9 @@
         {% endif %}
       </div>
       <div class="meta">
-        <p class="title">{{entry.title|shortentitle}}</p>
+        <a href="{{ url_for('show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+          <p class="title">{{entry.title|shortentitle}}</p>
+        </a>
         <p class="author">
           {% for author in entry.authors %}
             <a href="{{url_for('author', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
diff --git a/cps/templates/index.html b/cps/templates/index.html
index 9cc40d83..12fbd717 100755
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -17,7 +17,9 @@
           </a>
       </div>
       <div class="meta">
-        <p class="title">{{entry.title|shortentitle}}</p>
+        <a href="{{ url_for('show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+          <p class="title">{{entry.title|shortentitle}}</p>
+        </a>
         <p class="author">
           {% for author in entry.authors %}
             <a href="{{url_for('author', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
@@ -60,7 +62,9 @@
           </a>
       </div>
       <div class="meta">
-        <p class="title">{{entry.title|shortentitle}}</p>
+        <a href="{{ url_for('show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+          <p class="title">{{entry.title|shortentitle}}</p>
+        </a>
         <p class="author">
           {% for author in entry.authors %}
             <a href="{{url_for('author', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
diff --git a/cps/templates/search.html b/cps/templates/search.html
index 4a592d16..79bd1e98 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -5,7 +5,7 @@
       <h2>{{_('No Results for:')}} {{searchterm}}</h2>
       <p>{{_('Please try a different search')}}</p>
     {% else %}
-      <h2>{{entries|length}} {{_('Results for:')}} {{searchterm}}</h2>    
+      <h2>{{entries|length}} {{_('Results for:')}} {{searchterm}}</h2>
       {% if g.user.is_authenticated %}
         {% if g.user.shelf.all() or g.public_shelfes %}
           <div id="shelf-actions" class="btn-toolbar" role="toolbar">
@@ -41,7 +41,9 @@
         {% endif %}
       </div>
       <div class="meta">
-        <p class="title">{{entry.title|shortentitle}}</p>
+        <a href="{{ url_for('show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+          <p class="title">{{entry.title|shortentitle}}</p>
+        </a>
         <p class="author">
           {% for author in entry.authors %}
             <a href="{{url_for('author', book_id=author.id ) }}">{{author.name.replace('|',',')}}</a>
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index 28cd20bb..a317c14b 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -23,7 +23,9 @@
             </a>
       </div>
       <div class="meta">
-        <p class="title">{{entry.title|shortentitle}}</p>
+        <a href="{{ url_for('show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+          <p class="title">{{entry.title|shortentitle}}</p>
+        </a>
         <p class="author">
           {% for author in entry.authors %}
             <a href="{{url_for('author', book_id=author.id) }}">{{author.name.replace('|',',')}}</a>