diff --git a/src/colab/custom_settings.py b/src/colab/custom_settings.py
index 00823f4..9b7795d 100644
--- a/src/colab/custom_settings.py
+++ b/src/colab/custom_settings.py
@@ -5,8 +5,6 @@ DEBUG = False
TEMPLATE_DEBUG = False
-TIME_ZONE = 'America/Sao_Paulo'
-
LANGUAGES = (
('en', _('English')),
('pt-br', _('Portuguese')),
diff --git a/src/super_archives/templates/message-preview.html b/src/super_archives/templates/message-preview.html
index 846ace6..fa01127 100644
--- a/src/super_archives/templates/message-preview.html
+++ b/src/super_archives/templates/message-preview.html
@@ -1,5 +1,4 @@
-{% load i18n %}
-{% load highlight %}
+{% load i18n tz highlight %}
@@ -55,7 +54,7 @@
{% endif %}
{% if result.modified %}
- {{ result.modified|timesince }} {% trans "ago" %}
+ {{ result.modified|localtime|timesince }} {% trans "ago" %}
{% endif %}
{% endif %}
diff --git a/src/super_archives/templates/message-thread.html b/src/super_archives/templates/message-thread.html
index 393628c..1bc16c1 100644
--- a/src/super_archives/templates/message-thread.html
+++ b/src/super_archives/templates/message-thread.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% load i18n superarchives %}
+{% load i18n tz superarchives %}
{% trans "Anonymous" as anonymous %}
@@ -154,7 +154,7 @@
{% trans "started at" %}
- {{ first_msg.received_time|timesince }} {% trans "ago" %}
+ {{ first_msg.received_time|localtime|timesince }} {% trans "ago" %}
diff --git a/src/super_archives/templates/superarchives/includes/message.html b/src/super_archives/templates/superarchives/includes/message.html
index af3891f..8541778 100644
--- a/src/super_archives/templates/superarchives/includes/message.html
+++ b/src/super_archives/templates/superarchives/includes/message.html
@@ -1,4 +1,4 @@
-{% load gravatar superarchives i18n %}
+{% load gravatar superarchives tz i18n %}
{% spaceless %}
@@ -19,7 +19,7 @@
- {{ email.received_time|date:'DATETIME_FORMAT' }}
+ {{ email.received_time|localtime|date:'DATETIME_FORMAT' }}
--
libgit2 0.21.2