diff --git a/amadeus/templates/base.html b/amadeus/templates/base.html
index 3b2edc4..3977106 100644
--- a/amadeus/templates/base.html
+++ b/amadeus/templates/base.html
@@ -49,8 +49,7 @@
     <link rel="stylesheet" type="text/css" href="{% static 'css/base/amadeus.css' %}">
 
 	<!--Javascript block for specific-app ones -->
-	<script src="{% static 'js/base/amadeus.js' %}"></script>
-    
+	<script src="{% static 'js/base/amadeus.js' %}"></script>    
 	
     {% block style %}
 	{% endblock %}
@@ -114,7 +113,7 @@
                                             <div class="panel-collapse collapse" id="system_menu">
                                                 <div class="panel-body">
                                                     <ul class="submenu">
-                                                        <li><a href="{% url 'categories:index' %}">{% trans 'Mail Sender' %}</a></li>
+                                                        <li><a href="{% url 'mailsender:update' %}">{% trans 'Mail Sender' %}</a></li>
                                                         <li><a href="{% url 'categories:index' %}">{% trans 'Security' %}</a></li>
                                                         <li><a href="{% url 'categories:index' %}">{% trans 'Theme' %}</a></li>
                                                     </ul>
diff --git a/amadeus/urls.py b/amadeus/urls.py
index f288b09..41323ca 100644
--- a/amadeus/urls.py
+++ b/amadeus/urls.py
@@ -26,7 +26,8 @@ urlpatterns = [
     url(r'^admin/', admin.site.urls),
     url(r'^$', index, name = 'home'),
     url(r'^categories/', include('categories.urls', namespace = 'categories')),
-    url(r'^subjects/', include('subjects.urls', namespace='subjects')),
+    url(r'^subjects/', include('subjects.urls', namespace = 'subjects')),
+    url(r'^mailsender/', include('mailsender.urls', namespace = 'mailsender')),
     #API
     url(r'^o/', include('oauth2_provider.urls', namespace='oauth2_provider')),
     #S3Direct
diff --git a/mailsender/templates/mailsender/update.html b/mailsender/templates/mailsender/update.html
new file mode 100644
index 0000000..a00fa61
--- /dev/null
+++ b/mailsender/templates/mailsender/update.html
@@ -0,0 +1,63 @@
+{% extends 'base.html' %}
+
+{% load static i18n %}
+{% load widget_tweaks %}
+{% load django_bootstrap_breadcrumbs %}
+
+{% block breadcrumbs %}
+  	{{ block.super }}
+  	{% breadcrumb 'Settings' 'subjects:home' %}
+    {% breadcrumb 'Mail Sender' 'mailsender:update' %}
+{% endblock %}
+
+{% block content %}
+	<div class="card">
+		<div class="card-content">
+			<div class="card-body">
+				<form method="post" action="" enctype="multipart/form-data">
+					{% csrf_token %}
+					<legend>{% trans 'General server settings' %}</legend>
+					{% for field in form %}
+						{% if field.auto_id == 'id_username' %}
+							<br clear="all" />
+							<legend>{% trans 'Autentication' %}</legend>
+						{% elif field.auto_id == 'id_crypto' %}
+							<br clear="all" />
+							<legend>{% trans 'Criptografy' %}</legend>
+						{% endif %}
+						<div class="form-group{% if form.has_error %} has-error {% endif %} is-fileinput">
+							{% if field.field.required %}
+								<label for="{{ field.auto_id }}">{{ field.label }} <span>*</span></label>
+							{% else %}
+								<label for="{{ field.auto_id }}">{{ field.label }}</label>
+							{% endif %}
+							{% render_field field class='form-control' %}
+							
+							<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
+							
+							{% if field.errors %}
+								<div class="alert alert-danger alert-dismissible" role="alert">
+				  					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+				  						<span aria-hidden="true">&times;</span>
+										</button>
+									<ul>
+										{% for error in field.errors %}
+											<li>{{ error }}</li>
+										{% endfor %}
+									</ul>
+								</div>
+							{% endif %}
+						</div>
+					{% endfor %}
+					<div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
+						<div class="text-center">
+							<input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-primary" />
+						</div>
+					</div>
+				</form>
+			</div>
+		</div>
+  	</div>
+  	<br clear="all" />
+    <br clear="all" />
+{% endblock %}
diff --git a/mailsender/urls.py b/mailsender/urls.py
new file mode 100644
index 0000000..57a9a5a
--- /dev/null
+++ b/mailsender/urls.py
@@ -0,0 +1,6 @@
+from django.conf.urls import url
+from . import views
+
+urlpatterns = [
+	url(r'^$', views.MailSenderSettings.as_view(), name = 'update'),
+]
\ No newline at end of file
diff --git a/mailsender/views.py b/mailsender/views.py
index 96fd915..f707903 100644
--- a/mailsender/views.py
+++ b/mailsender/views.py
@@ -1,5 +1,6 @@
 from django.views import generic
 from django.shortcuts import render
+from django.contrib import messages
 from django.core.urlresolvers import reverse, reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 
@@ -28,8 +29,9 @@ class MailSenderSettings(braces_mixins.LoginRequiredMixin, braces_mixins.Staffus
 		return super(MailSenderSettings, self).form_valid(form)
 
 	def get_context_data(self, **kwargs):
-		context = super(MailSenderSettings, self).context(**kwargs)
+		context = super(MailSenderSettings, self).get_context_data(**kwargs)
 
 		context['title'] = _('Mail Sender')
+		context['settings_menu_active'] = "settings_menu_active"
 
 		return context
\ No newline at end of file
diff --git a/subjects/templates/subjects/initial.html b/subjects/templates/subjects/initial.html
index 9cb5f6c..df6002e 100644
--- a/subjects/templates/subjects/initial.html
+++ b/subjects/templates/subjects/initial.html
@@ -3,9 +3,19 @@
 {% load static pagination i18n %}
 
 {% block content %}
+	{% if messages %}
+        {% for message in messages %}
+            <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
+                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+                <p>{{ message }}</p>
+            </div>
+        {% endfor %}
+    {% endif %}
+    
 	<h2 class=" my-subjects-title"><b><i>{% trans "Palavras-chave mais populares" %}</i></b></h2>
 	<div id="" class="col-md-12">
-
 		<div class="users-cloud div-users-cloud">
 			<ul class=" users-cloud">
 				{% for tag in tags %}
@@ -24,6 +34,7 @@
 		</div>
 	</div>
 
-	{% pagination request paginator page_obj %} 
+	{% pagination request paginator page_obj %}
+
     <script type="text/javascript" src="{% static 'js/course.js' %}"></script>
 {% endblock content %}
\ No newline at end of file
--
libgit2 0.21.2