3 files changed, 12 insertions, 6 deletions
diff --git a/src/jwebmail/templates/_main_table.html b/src/jwebmail/templates/_main_table.html
index 02f9f81..b331087 100644
--- a/src/jwebmail/templates/_main_table.html
+++ b/src/jwebmail/templates/_main_table.html
@@ -18,7 +18,9 @@
           </div>
 
           <div class="column is-10">
-            <a href="{{ url_for('read', msgid=msg.message_handle) }}">{{ msg.head.subject or '_' }}</a>
+            <a href="{{ url_for('read', msgid=msg.message_handle, folder=folder) }}">
+              {{ msg.head.subject or '_' }}
+            </a>
           </div>
 
           <div class="column is-2">
diff --git a/src/jwebmail/templates/about.html b/src/jwebmail/templates/about.html
index e197275..836b668 100644
--- a/src/jwebmail/templates/about.html
+++ b/src/jwebmail/templates/about.html
@@ -40,7 +40,11 @@
     <ul>
 {% for lang in languages %}
     <li>
-      {{ get_locale().languages[lang.language] }}
+      {% if lang == get_locale() %}
+        <a href="{{ url_for('about', lang_code=lang.language) }}"><strong>{{ get_locale().languages[lang.language] }}</strong></a>
+      {% else %}
+        <a href="{{ url_for('about', lang_code=lang.language) }}">{{ get_locale().languages[lang.language] }}</a>
+      {% endif %}
     </li>
 {% endfor %}
     </ul>
diff --git a/src/jwebmail/templates/login.html b/src/jwebmail/templates/login.html
index 2915de3..d73238d 100644
--- a/src/jwebmail/templates/login.html
+++ b/src/jwebmail/templates/login.html
@@ -26,7 +26,7 @@
   </div>
 {% endif %}
 
-  <form name="login1" method="POST" class="pure-form pure-form-aligned jwm-round">
+  <form name="login1" id="login1" method="POST" class="pure-form pure-form-aligned jwm-round">
 
     {{ login_form.csrf_token }}
 
@@ -74,10 +74,10 @@
 
 {% block scripts %}
   <script type="text/javascript">
-    if (!document.login1.userid.value) {
-      document.login1.userid.focus();
+    if (!document.forms.login1.username.value) {
+      document.forms.login1.username.focus();
     } else {
-      document.login1.password.focus();
+      document.forms.login1.password.focus();
     }
   </script>
 {% endblock %}