diff --git a/django_messages/locale/ru/LC_MESSAGES/django.mo b/django_messages/locale/ru/LC_MESSAGES/django.mo
index 90aeca4..ee62d5d 100644
Binary files a/django_messages/locale/ru/LC_MESSAGES/django.mo and b/django_messages/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/django_messages/locale/ru/LC_MESSAGES/django.po b/django_messages/locale/ru/LC_MESSAGES/django.po
index 34b76b6..1f043b8 100644
--- a/django_messages/locale/ru/LC_MESSAGES/django.po
+++ b/django_messages/locale/ru/LC_MESSAGES/django.po
@@ -2,221 +2,187 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Michail Sychev m.sychev@axion-rti.ru, 2009
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-11 12:31-0700\n"
+"POT-Creation-Date: 2017-02-20 17:32+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin.py:13 forms.py:20 models.py:52 templates/messages/outbox.html:7
-#: templates/messages/view.html:12
-msgid "Recipient"
-msgstr "Получатель"
-
-#: admin.py:15
+#: django_messages/admin.py:21
 msgid "group"
 msgstr "Группа"
 
-#: admin.py:16
+#: django_messages/admin.py:22
 msgid "Creates the message optionally for all users or a group of users."
 msgstr "Создать сообщения опционально для всех пользователей или группы"
 
-#: admin.py:23
+#: django_messages/admin.py:30
 msgid "All users"
 msgstr "Все пользователи"
 
-#: admin.py:38 models.py:88
+#: django_messages/admin.py:48 django_messages/models.py:91
 msgid "Message"
 msgstr "Сообщение"
 
-#: admin.py:45
+#: django_messages/admin.py:55
 msgid "Date/time"
 msgstr "Дата/Время"
 
-#: fields.py:53
-#, python-format
-msgid "The following usernames are incorrect: %(users)s"
-msgstr "Некорректные имена пользователей: %(users)s"
+#: django_messages/apps.py:6 django_messages/models.py:92
+msgid "Messages"
+msgstr "Сообщения"
+
+#: django_messages/forms.py:21 django_messages/models.py:55
+#: django_messages/templates/django_messages/compose.html:14
+#: django_messages/templates/django_messages/outbox.html:9
+#: django_messages/templates/django_messages/view.html:13
+msgid "Recipient"
+msgstr "Получатель"
 
-#: forms.py:21 models.py:49 templates/messages/inbox.html:7
-#: templates/messages/outbox.html:7 templates/messages/trash.html:7
-#: templates/messages/view.html:6
+#: django_messages/forms.py:27 django_messages/models.py:52
+#: django_messages/templates/django_messages/compose.html:23
+#: django_messages/templates/django_messages/inbox.html:9
+#: django_messages/templates/django_messages/outbox.html:9
+#: django_messages/templates/django_messages/trash.html:9
+#: django_messages/templates/django_messages/view.html:7
 msgid "Subject"
 msgstr "Тема"
 
-#: forms.py:22 models.py:50
+#: django_messages/forms.py:31 django_messages/models.py:53
+#: django_messages/templates/django_messages/compose.html:32
 msgid "Body"
 msgstr "Сообщение"
 
-#: management.py:9
+#: django_messages/management.py:9
 msgid "Message Received"
 msgstr "Сообщение получено"
 
-#: management.py:9
+#: django_messages/management.py:9
 msgid "you have received a message"
 msgstr "вы получили сообщение"
 
-#: management.py:10
+#: django_messages/management.py:10
 msgid "Message Sent"
 msgstr "Сообщение отправлено"
 
-#: management.py:10
+#: django_messages/management.py:10
 msgid "you have sent a message"
 msgstr "Вы отправили сообщение"
 
-#: management.py:11
+#: django_messages/management.py:11
 msgid "Message Replied"
 msgstr "Сообщение отвечено"
 
-#: management.py:11
+#: django_messages/management.py:11
 msgid "you have replied to a message"
 msgstr "вы ответили на сообщение"
 
-#: management.py:12
+#: django_messages/management.py:12
 msgid "Reply Received"
 msgstr "Ответ получен"
 
-#: management.py:12
+#: django_messages/management.py:12
 msgid "you have received a reply to a message"
 msgstr "вы получили ответ на сообщение"
 
-#: management.py:13
+#: django_messages/management.py:13
 msgid "Message Deleted"
 msgstr "Сообщение удалено"
 
-#: management.py:13
+#: django_messages/management.py:13
 msgid "you have deleted a message"
 msgstr "вы удалили сообщение"
 
-#: management.py:14
+#: django_messages/management.py:14
 msgid "Message Recovered"
 msgstr "Сообщение восстановлено"
 
-#: management.py:14
+#: django_messages/management.py:14
 msgid "you have undeleted a message"
 msgstr "вы восстановили сообщение"
 
-#: models.py:51 templates/messages/inbox.html:7
-#: templates/messages/trash.html:7 templates/messages/view.html:8
+#: django_messages/models.py:54
+#: django_messages/templates/django_messages/inbox.html:9
+#: django_messages/templates/django_messages/trash.html:9
+#: django_messages/templates/django_messages/view.html:9
 msgid "Sender"
 msgstr "Отправитель"
 
-#: models.py:53
+#: django_messages/models.py:56
 msgid "Parent message"
 msgstr "Родительское сообщение"
 
-#: models.py:54
+#: django_messages/models.py:57
 msgid "sent at"
 msgstr "отправлено"
 
-#: models.py:55
+#: django_messages/models.py:58
 msgid "read at"
 msgstr "прочитано"
 
-#: models.py:56
+#: django_messages/models.py:59
 msgid "replied at"
 msgstr "отвечено"
 
-#: models.py:57
+#: django_messages/models.py:60
 msgid "Sender deleted at"
 msgstr "Отправитель удалил"
 
-#: models.py:58
+#: django_messages/models.py:61
 msgid "Recipient deleted at"
 msgstr "Получатель удалил"
 
-#: models.py:89
-msgid "Messages"
-msgstr "Сообщения"
-
-#: utils.py:27
-#, python-format
-msgid "New Message: %(subject)s"
-msgstr "Новое сообщение: %(subject)s"
-
-#: views.py:78 views.py:112
-msgid "Message successfully sent."
-msgstr "Сообщение успешно отправлено."
-
-#: views.py:118
-#, python-format
-msgid ""
-"%(sender)s wrote:\n"
-"%(body)s"
-msgstr ""
-"%(sender)s написал:\n"
-"%(body)s"
-
-#: views.py:122
-#, python-format
-msgid "Re: %(subject)s"
-msgstr "Re: %(subject)s"
-
-#: views.py:158
-msgid "Message successfully deleted."
-msgstr "Сообщение успешно удалено."
-
-#: views.py:185
-msgid "Message successfully recovered."
-msgstr "Сообщение успешно восстановлено."
-
-#: templates/messages/base.html:8 templates/messages/inbox.html:4
-#: templates/messages/new_message.html:10
-msgid "Inbox"
-msgstr "Входящие"
-
-#: templates/messages/base.html:9 templates/messages/outbox.html:4
-msgid "Sent Messages"
-msgstr "Исходящие"
-
-#: templates/messages/base.html:10
-msgid "New Message"
-msgstr "Новое сообщение"
-
-#: templates/messages/base.html:11
-msgid "Trash"
-msgstr "Удалённые"
-
-#: templates/messages/compose.html:4
+#: django_messages/templates/django_messages/compose.html:8
 msgid "Compose Message"
 msgstr "Новое сообщение"
 
-#: templates/messages/compose.html:9
+#: django_messages/templates/django_messages/compose.html:42
 msgid "Send"
 msgstr "Отправить"
 
-#: templates/messages/inbox.html:7
+#: django_messages/templates/django_messages/inbox.html:5
+#: django_messages/templates/django_messages/new_message.html:12
+msgid "Inbox"
+msgstr "Входящие"
+
+#: django_messages/templates/django_messages/inbox.html:9
 msgid "Received"
 msgstr "Получено"
 
-#: templates/messages/inbox.html:7 templates/messages/outbox.html:7
-#: templates/messages/trash.html:7
+#: django_messages/templates/django_messages/inbox.html:9
+#: django_messages/templates/django_messages/outbox.html:9
+#: django_messages/templates/django_messages/trash.html:9
 msgid "Action"
 msgstr "Действия"
 
-#: templates/messages/inbox.html:19 templates/messages/outbox.html:16
-#: templates/messages/trash.html:16 templates/messages/view.html:11
+#: django_messages/templates/django_messages/inbox.html:21
+#: django_messages/templates/django_messages/outbox.html:18
+#: django_messages/templates/django_messages/trash.html:18
+#: django_messages/templates/django_messages/view.html:12
 msgid "DATETIME_FORMAT"
 msgstr "j. N Y, H:i"
 
-#: templates/messages/inbox.html:20 templates/messages/outbox.html:17
+#: django_messages/templates/django_messages/inbox.html:22
+#: django_messages/templates/django_messages/outbox.html:19
 msgid "delete"
 msgstr "удалить"
 
-#: templates/messages/inbox.html:27 templates/messages/outbox.html:24
-#: templates/messages/trash.html:24
+#: django_messages/templates/django_messages/inbox.html:28
+#: django_messages/templates/django_messages/outbox.html:25
+#: django_messages/templates/django_messages/trash.html:25
 msgid "No messages."
 msgstr "Сообщений нет."
 
-#: templates/messages/new_message.html:1
+#: django_messages/templates/django_messages/new_message.html:3
 #, python-format
 msgid ""
 "Hello %(recipient)s,\n"
@@ -229,32 +195,38 @@ msgstr ""
 "Вы получили сообщение от %(sender)s\n"
 "со следующим содержанием:"
 
-#: templates/messages/new_message.html:9
+#: django_messages/templates/django_messages/new_message.html:11
 #, python-format
 msgid "Sent from %(site_url)s"
 msgstr "Отправлено %(site_url)s"
 
-#: templates/messages/new_message.html:11 templates/messages/view.html:18
+#: django_messages/templates/django_messages/new_message.html:13
+#: django_messages/templates/django_messages/view.html:19
 msgid "Reply"
 msgstr "Ответить"
 
-#: templates/messages/outbox.html:7
+#: django_messages/templates/django_messages/outbox.html:5
+msgid "Sent Messages"
+msgstr "Исходящие"
+
+#: django_messages/templates/django_messages/outbox.html:9
 msgid "Sent"
 msgstr "Отправлено"
 
-#: templates/messages/trash.html:4
+#: django_messages/templates/django_messages/trash.html:5
 msgid "Deleted Messages"
 msgstr "Удалённые сообщения"
 
-#: templates/messages/trash.html:7 templates/messages/view.html:10
+#: django_messages/templates/django_messages/trash.html:9
+#: django_messages/templates/django_messages/view.html:11
 msgid "Date"
 msgstr "Дата"
 
-#: templates/messages/trash.html:17
+#: django_messages/templates/django_messages/trash.html:19
 msgid "undelete"
 msgstr "восстановить"
 
-#: templates/messages/trash.html:23
+#: django_messages/templates/django_messages/trash.html:28
 msgid ""
 "Deleted Messages are removed from the trash at unregular intervals, don't "
 "rely on this feature for long-time storage."
@@ -262,54 +234,100 @@ msgstr ""
 "Удалённые сообщения очищаются из корзины через произвольные интервалы,не "
 "используйте эту возможность как долгосрочное хранилище."
 
-#: templates/messages/view.html:4
+#: django_messages/templates/django_messages/view.html:5
 msgid "View Message"
 msgstr "Просмотр сообщений"
 
-#: templates/messages/view.html:20
+#: django_messages/templates/django_messages/view.html:21
 msgid "Delete"
 msgstr "Удалить"
 
-#: templates/notification/messages_deleted/notice.html:1
+#: django_messages/templates/notification/messages_deleted/notice.html:1
 #, python-format
 msgid ""
 "You have deleted the message <a href=\"%(message_url)s\">%(message)s</a>."
 msgstr "Вы удалили сообщение <a href=\"%(message_url)s\">%(message)s</a>."
 
-#: templates/notification/messages_received/notice.html:2
+#: django_messages/templates/notification/messages_received/notice.html:2
 #, python-format
 msgid ""
 "You have received the message <a href=\"%(message_url)s\">%(message)s</a> "
 "from %(message_sender)s."
 msgstr ""
-"Вы получили сообщение <a href=\"%(message_url)s\">%(message)s</a> от %"
-"(message_sender)s."
+"Вы получили сообщение <a href=\"%(message_url)s\">%(message)s</a> от "
+"%(message_sender)s."
 
-#: templates/notification/messages_recovered/notice.html:1
+#: django_messages/templates/notification/messages_recovered/notice.html:1
 #, python-format
 msgid ""
 "You have recovered the message <a href=\"%(message_url)s\">%(message)s</a>."
 msgstr "Вы восстановили сообщение <a href=\"%(message_url)s\">%(message)s</a>."
 
-#: templates/notification/messages_replied/notice.html:2
+#: django_messages/templates/notification/messages_replied/notice.html:2
 #, python-format
 msgid ""
 "You have replied to <a href=\"%(message_url)s\">%(message_parent_msg)s</a> "
 "from %(message_recipient)s."
 msgstr ""
-"Вы ответили на <a href=\"%(message_url)s\">%(message_parent_msg)s</a> от %"
-"(message_recipient)s."
+"Вы ответили на <a href=\"%(message_url)s\">%(message_parent_msg)s</a> от "
+"%(message_recipient)s."
 
-#: templates/notification/messages_reply_received/notice.html:2
+#: django_messages/templates/notification/messages_reply_received/notice.html:2
 #, python-format
 msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s."
 msgstr "%(message_sender)s ответил на %(message_parent_msg)s."
 
-#: templates/notification/messages_sent/notice.html:2
+#: django_messages/templates/notification/messages_sent/notice.html:2
 #, python-format
 msgid ""
-"You have sent the message <a href=\"%(message_url)s\">%(message)s</a> to %"
-"(message_recipient)s."
+"You have sent the message <a href=\"%(message_url)s\">%(message)s</a> to "
+"%(message_recipient)s."
 msgstr ""
 "Вы отправили сообщение <a href=\"%(message_url)s\">%(message)s</a> "
 "получателям %(message_recipient)s."
+
+#: django_messages/utils.py:20
+#, python-format
+msgid ""
+"%(sender)s wrote:\n"
+"%(body)s"
+msgstr ""
+"%(sender)s написал:\n"
+"%(body)s"
+
+#: django_messages/utils.py:49
+#, fuzzy, python-format
+#| msgid "Re: %(subject)s"
+msgid "Re%(prefix)s: %(subject)s"
+msgstr "Re: %(subject)s"
+
+#: django_messages/utils.py:56
+#, python-format
+msgid "New Message: %(subject)s"
+msgstr "Новое сообщение: %(subject)s"
+
+#: django_messages/views.py:83 django_messages/views.py:121
+msgid "Message successfully sent."
+msgstr "Сообщение успешно отправлено."
+
+#: django_messages/views.py:103 django_messages/views.py:202
+#, python-format
+msgid "Re: %(subject)s"
+msgstr "Re: %(subject)s"
+
+#: django_messages/views.py:165
+msgid "Message successfully deleted."
+msgstr "Сообщение успешно удалено."
+
+#: django_messages/views.py:193
+msgid "Message successfully recovered."
+msgstr "Сообщение успешно восстановлено."
+
+msgid "The following usernames are incorrect: %(users)s"
+msgstr "Некорректные имена пользователей: %(users)s"
+
+msgid "New Message"
+msgstr "Новое сообщение"
+
+msgid "Trash"
+msgstr "Удалённые"