diff --git a/translations/en.mo b/translations/en.mo
index 568b7c3..bc070ff 100644
Binary files a/translations/en.mo and b/translations/en.mo differ
diff --git a/translations/en.po b/translations/en.po
index b781648..da78bd1 100644
--- a/translations/en.po
+++ b/translations/en.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Toxic 0.6.0\n"
 "Report-Msgid-Bugs-To: JFreegman@tox.chat\n"
-"POT-Creation-Date: 2015-05-30 11:30+0200\n"
+"POT-Creation-Date: 2015-06-30 23:49-0400\n"
 "PO-Revision-Date: 2015-05-30 11:30+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ASCII\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -166,11 +167,11 @@ msgstr "yes"
 msgid "no"
 msgstr "no"
 
-#: ../src/chat.c:223 ../src/prompt.c:360
+#: ../src/chat.c:223 ../src/prompt.c:363
 msgid "has come online"
 msgstr "has come online"
 
-#: ../src/chat.c:234 ../src/prompt.c:372
+#: ../src/chat.c:234 ../src/prompt.c:375
 msgid "has gone offline"
 msgstr "has gone offline"
 
@@ -328,11 +329,11 @@ msgstr " Out muted: "
 msgid " VAD level: "
 msgstr " VAD level: "
 
-#: ../src/chat.c:1080
+#: ../src/chat.c:1083
 msgid "failed in chat_onInit"
 msgstr "failed in chat_onInit"
 
-#: ../src/chat.c:1152
+#: ../src/chat.c:1155
 msgid "failed in new_chat"
 msgstr "failed in new_chat"
 
@@ -868,33 +869,6 @@ msgstr "Require a status. Statuses are: %s."
 msgid "Invalid status. Valid statuses are: %s."
 msgstr "Invalid status. Valid statuses are: %s."
 
-#: ../src/group_commands.c:46
-#, c-format
-msgid "Title is set to: %s"
-msgstr "Title is set to: %s"
-
-#: ../src/group_commands.c:48
-msgid "Title is not set"
-msgstr "Title is not set"
-
-#: ../src/group_commands.c:55
-msgid "Title must be enclosed in quotes."
-msgstr "Title must be enclosed in quotes."
-
-#: ../src/group_commands.c:65
-msgid "Failed to set title."
-msgstr "Failed to set title."
-
-#: ../src/group_commands.c:80 ../src/groupchat.c:337
-#, c-format
-msgid " set the group title to: %s"
-msgstr " set the group title to: %s"
-
-#: ../src/group_commands.c:83 ../src/groupchat.c:340
-#, c-format
-msgid "set title to %s"
-msgstr "set title to %s"
-
 #: ../src/groupchat.c:143
 msgid "failed in init_groupchat_win"
 msgstr "failed in init_groupchat_win"
@@ -904,6 +878,16 @@ msgstr "failed in init_groupchat_win"
 msgid "Group Audio failed to init\n"
 msgstr "Group Audio failed to init\n"
 
+#: ../src/groupchat.c:337 ../src/group_commands.c:80
+#, c-format
+msgid " set the group title to: %s"
+msgstr " set the group title to: %s"
+
+#: ../src/groupchat.c:340 ../src/group_commands.c:83
+#, c-format
+msgid "set title to %s"
+msgstr "set title to %s"
+
 #: ../src/groupchat.c:362
 msgid "failed in copy_peernames"
 msgstr "failed in copy_peernames"
@@ -937,44 +921,61 @@ msgstr " * Failed to send action."
 msgid " * Failed to send message."
 msgstr " * Failed to send message."
 
-#: ../src/groupchat.c:678
+#: ../src/groupchat.c:681
 #, c-format
 msgid "Peers: %d\n"
 msgstr "Peers: %d\n"
 
-#: ../src/groupchat.c:728
+#: ../src/groupchat.c:731
 msgid "failed in groupchat_onInit"
 msgstr "failed in groupchat_onInit"
 
-#: ../src/groupchat.c:813
+#: ../src/groupchat.c:816
 #, c-format
 msgid "source: %d, queued: %d, processed: %d\n"
 msgstr "source: %d, queued: %d, processed: %d\n"
 
-#: ../src/groupchat.c:852
+#: ../src/groupchat.c:855
 #, c-format
 msgid "dvhandle is null)\n"
 msgstr "dvhandle is null)\n"
 
-#: ../src/groupchat.c:855
+#: ../src/groupchat.c:858
 #, c-format
 msgid "ctx is null\n"
 msgstr "ctx is null\n"
 
-#: ../src/groupchat.c:858
+#: ../src/groupchat.c:861
 #, c-format
 msgid "write: %d\n"
 msgstr "write: %d\n"
 
-#: ../src/groupchat.c:882
+#: ../src/groupchat.c:885
 #, c-format
 msgid "Group %d"
 msgstr "Group %d"
 
-#: ../src/groupchat.c:888
+#: ../src/groupchat.c:891
 msgid "failed in new_group_chat"
 msgstr "failed in new_group_chat"
 
+#: ../src/group_commands.c:46
+#, c-format
+msgid "Title is set to: %s"
+msgstr "Title is set to: %s"
+
+#: ../src/group_commands.c:48
+msgid "Title is not set"
+msgstr "Title is not set"
+
+#: ../src/group_commands.c:55
+msgid "Title must be enclosed in quotes."
+msgstr "Title must be enclosed in quotes."
+
+#: ../src/group_commands.c:65
+msgid "Failed to set title."
+msgstr "Failed to set title."
+
 #: ../src/help.c:148
 msgid "Global Commands:\n"
 msgstr "Global Commands:\n"
@@ -1218,72 +1219,72 @@ msgstr "failed in get_file_name"
 msgid "Failed to set note (error %d)\n"
 msgstr "Failed to set note (error %d)\n"
 
-#: ../src/prompt.c:271
+#: ../src/prompt.c:274
 msgid "ERROR"
 msgstr "ERROR"
 
-#: ../src/prompt.c:275
+#: ../src/prompt.c:278
 msgid "Online"
 msgstr "Online"
 
-#: ../src/prompt.c:279
+#: ../src/prompt.c:282
 msgid "Away"
 msgstr "Away"
 
-#: ../src/prompt.c:283
+#: ../src/prompt.c:286
 msgid "Busy"
 msgstr "Busy"
 
-#: ../src/prompt.c:296
+#: ../src/prompt.c:299
 msgid " [Offline]"
 msgstr " [Offline]"
 
-#: ../src/prompt.c:366 ../src/prompt.c:369
+#: ../src/prompt.c:369 ../src/prompt.c:372
 #, c-format
 msgid "%s has come online"
 msgstr "%s has come online"
 
-#: ../src/prompt.c:378 ../src/prompt.c:381
+#: ../src/prompt.c:381 ../src/prompt.c:384
 #, c-format
 msgid "%s has gone offline"
 msgstr "%s has gone offline"
 
-#: ../src/prompt.c:392 ../src/prompt.c:393
+#: ../src/prompt.c:395 ../src/prompt.c:396
 #, c-format
 msgid "Friend request with the message '%s'"
 msgstr "Friend request with the message '%s'"
 
-#: ../src/prompt.c:398
+#: ../src/prompt.c:401
 msgid "Friend request queue is full. Discarding request."
 msgstr "Friend request queue is full. Discarding request."
 
-#: ../src/prompt.c:403
+#: ../src/prompt.c:406
 #, c-format
 msgid "Type \"%s %d\" or \"%s %d\""
 msgstr "Type \"%s %d\" or \"%s %d\""
 
-#: ../src/prompt.c:432 ../src/prompt.c:433
+#: ../src/prompt.c:435 ../src/prompt.c:436
 #, c-format
 msgid "Toxing on Toxic"
 msgstr "Toxing on Toxic"
 
-#: ../src/prompt.c:455
+#: ../src/prompt.c:458
 msgid ""
 "Welcome to Toxic, a free, open source Tox-based instant messenging client."
 msgstr ""
 "Welcome to Toxic, a free, open source Tox-based instant messenging client."
 
-#: ../src/prompt.c:457
+#: ../src/prompt.c:460
 #, c-format
 msgid "Type \"%s\" for assistance. Further help may be found via the man page."
 msgstr ""
 "Type \"%s\" for assistance. Further help may be found via the man page."
 
-#: ../src/prompt.c:476
+#: ../src/prompt.c:479
 msgid "failed in prompt_onInit"
 msgstr "failed in prompt_onInit"
 
-#: ../src/prompt.c:514
+#: ../src/prompt.c:517
 msgid "failed in new_prompt"
 msgstr "failed in new_prompt"
 
diff --git a/translations/toxic.pot b/translations/toxic.pot
index 843ca16..0c0f461 100644
--- a/translations/toxic.pot
+++ b/translations/toxic.pot
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2015 Toxic Team
+# Copyright (C) YEAR Toxic Team
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Toxic 0.6.0\n"
 "Report-Msgid-Bugs-To: JFreegman@tox.chat\n"
-"POT-Creation-Date: 2015-05-30 11:30+0200\n"
+"POT-Creation-Date: 2015-06-30 23:49-0400\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=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -166,11 +167,11 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: ../src/chat.c:223 ../src/prompt.c:360
+#: ../src/chat.c:223 ../src/prompt.c:363
 msgid "has come online"
 msgstr ""
 
-#: ../src/chat.c:234 ../src/prompt.c:372
+#: ../src/chat.c:234 ../src/prompt.c:375
 msgid "has gone offline"
 msgstr ""
 
@@ -328,11 +329,11 @@ msgstr ""
 msgid " VAD level: "
 msgstr ""
 
-#: ../src/chat.c:1080
+#: ../src/chat.c:1083
 msgid "failed in chat_onInit"
 msgstr ""
 
-#: ../src/chat.c:1152
+#: ../src/chat.c:1155
 msgid "failed in new_chat"
 msgstr ""
 
@@ -862,33 +863,6 @@ msgstr ""
 msgid "Invalid status. Valid statuses are: %s."
 msgstr ""
 
-#: ../src/group_commands.c:46
-#, c-format
-msgid "Title is set to: %s"
-msgstr ""
-
-#: ../src/group_commands.c:48
-msgid "Title is not set"
-msgstr ""
-
-#: ../src/group_commands.c:55
-msgid "Title must be enclosed in quotes."
-msgstr ""
-
-#: ../src/group_commands.c:65
-msgid "Failed to set title."
-msgstr ""
-
-#: ../src/group_commands.c:80 ../src/groupchat.c:337
-#, c-format
-msgid " set the group title to: %s"
-msgstr ""
-
-#: ../src/group_commands.c:83 ../src/groupchat.c:340
-#, c-format
-msgid "set title to %s"
-msgstr ""
-
 #: ../src/groupchat.c:143
 msgid "failed in init_groupchat_win"
 msgstr ""
@@ -898,6 +872,16 @@ msgstr ""
 msgid "Group Audio failed to init\n"
 msgstr ""
 
+#: ../src/groupchat.c:337 ../src/group_commands.c:80
+#, c-format
+msgid " set the group title to: %s"
+msgstr ""
+
+#: ../src/groupchat.c:340 ../src/group_commands.c:83
+#, c-format
+msgid "set title to %s"
+msgstr ""
+
 #: ../src/groupchat.c:362
 msgid "failed in copy_peernames"
 msgstr ""
@@ -931,44 +915,61 @@ msgstr ""
 msgid " * Failed to send message."
 msgstr ""
 
-#: ../src/groupchat.c:678
+#: ../src/groupchat.c:681
 #, c-format
 msgid "Peers: %d\n"
 msgstr ""
 
-#: ../src/groupchat.c:728
+#: ../src/groupchat.c:731
 msgid "failed in groupchat_onInit"
 msgstr ""
 
-#: ../src/groupchat.c:813
+#: ../src/groupchat.c:816
 #, c-format
 msgid "source: %d, queued: %d, processed: %d\n"
 msgstr ""
 
-#: ../src/groupchat.c:852
+#: ../src/groupchat.c:855
 #, c-format
 msgid "dvhandle is null)\n"
 msgstr ""
 
-#: ../src/groupchat.c:855
+#: ../src/groupchat.c:858
 #, c-format
 msgid "ctx is null\n"
 msgstr ""
 
-#: ../src/groupchat.c:858
+#: ../src/groupchat.c:861
 #, c-format
 msgid "write: %d\n"
 msgstr ""
 
-#: ../src/groupchat.c:882
+#: ../src/groupchat.c:885
 #, c-format
 msgid "Group %d"
 msgstr ""
 
-#: ../src/groupchat.c:888
+#: ../src/groupchat.c:891
 msgid "failed in new_group_chat"
 msgstr ""
 
+#: ../src/group_commands.c:46
+#, c-format
+msgid "Title is set to: %s"
+msgstr ""
+
+#: ../src/group_commands.c:48
+msgid "Title is not set"
+msgstr ""
+
+#: ../src/group_commands.c:55
+msgid "Title must be enclosed in quotes."
+msgstr ""
+
+#: ../src/group_commands.c:65
+msgid "Failed to set title."
+msgstr ""
+
 #: ../src/help.c:148
 msgid "Global Commands:\n"
 msgstr ""
@@ -1201,70 +1202,70 @@ msgstr ""
 msgid "Failed to set note (error %d)\n"
 msgstr ""
 
-#: ../src/prompt.c:271
+#: ../src/prompt.c:274
 msgid "ERROR"
 msgstr ""
 
-#: ../src/prompt.c:275
+#: ../src/prompt.c:278
 msgid "Online"
 msgstr ""
 
-#: ../src/prompt.c:279
+#: ../src/prompt.c:282
 msgid "Away"
 msgstr ""
 
-#: ../src/prompt.c:283
+#: ../src/prompt.c:286
 msgid "Busy"
 msgstr ""
 
-#: ../src/prompt.c:296
+#: ../src/prompt.c:299
 msgid " [Offline]"
 msgstr ""
 
-#: ../src/prompt.c:366 ../src/prompt.c:369
+#: ../src/prompt.c:369 ../src/prompt.c:372
 #, c-format
 msgid "%s has come online"
 msgstr ""
 
-#: ../src/prompt.c:378 ../src/prompt.c:381
+#: ../src/prompt.c:381 ../src/prompt.c:384
 #, c-format
 msgid "%s has gone offline"
 msgstr ""
 
-#: ../src/prompt.c:392 ../src/prompt.c:393
+#: ../src/prompt.c:395 ../src/prompt.c:396
 #, c-format
 msgid "Friend request with the message '%s'"
 msgstr ""
 
-#: ../src/prompt.c:398
+#: ../src/prompt.c:401
 msgid "Friend request queue is full. Discarding request."
 msgstr ""
 
-#: ../src/prompt.c:403
+#: ../src/prompt.c:406
 #, c-format
 msgid "Type \"%s %d\" or \"%s %d\""
 msgstr ""
 
-#: ../src/prompt.c:432 ../src/prompt.c:433
+#: ../src/prompt.c:435 ../src/prompt.c:436
 #, c-format
 msgid "Toxing on Toxic"
 msgstr ""
 
-#: ../src/prompt.c:455
+#: ../src/prompt.c:458
 msgid ""
 "Welcome to Toxic, a free, open source Tox-based instant messenging client."
 msgstr ""
 
-#: ../src/prompt.c:457
+#: ../src/prompt.c:460
 #, c-format
 msgid "Type \"%s\" for assistance. Further help may be found via the man page."
 msgstr ""
 
-#: ../src/prompt.c:476
+#: ../src/prompt.c:479
 msgid "failed in prompt_onInit"
 msgstr ""
 
-#: ../src/prompt.c:514
+#: ../src/prompt.c:517
 msgid "failed in new_prompt"
 msgstr ""