diff --git a/src/components/app/EditPanel.vue b/src/components/app/EditPanel.vue
index aa49fcd..35fa4b1 100644
--- a/src/components/app/EditPanel.vue
+++ b/src/components/app/EditPanel.vue
@@ -1,12 +1,14 @@
 <template>
   <div class="edit-panel" v-if="selectedChannelID === data.channelID">
     <div class="title">Edit Message:</div>
-    <div class="message">{{data.message}}</div>
+    <div class="message" v-html="message"></div>
     <div class="close-button" @click="close">Cancel</div>
   </div>
 </template>
 
 <script>
+import messageFormatter from "@/utils/messageFormatter.js";
+
 export default {
   props: ['data'],
   methods: {
@@ -26,6 +28,9 @@ export default {
     document.removeEventListener('keydown', this.keyDownEvent)
   },
   computed: {
+    message() {
+      return messageFormatter(this.data.message)
+    },
     selectedChannelID() {
       return this.$store.getters.selectedChannelID;
     },
@@ -70,5 +75,6 @@ export default {
   white-space: nowrap; 
   overflow: hidden;
   text-overflow: ellipsis;
+  
 }
 </style>
diff --git a/src/components/app/MessagePanel.vue b/src/components/app/MessagePanel.vue
index cf09b11..e10a5ec 100644
--- a/src/components/app/MessagePanel.vue
+++ b/src/components/app/MessagePanel.vue
@@ -519,7 +519,7 @@ export default {
       if (!editMessage) {
         this.message = ""
       } else {
-      this.message = editMessage.message
+        this.message = emojiParser.emojiToShortcode(editMessage.message)
       }
     }
   },
diff --git a/src/components/app/MessageTemplate.vue b/src/components/app/MessageTemplate.vue
index 92fcce9..d7ba871 100644
--- a/src/components/app/MessageTemplate.vue
+++ b/src/components/app/MessageTemplate.vue
@@ -408,11 +408,11 @@ export default {
   word-wrap: break-word;
   word-break: break-word;
   white-space: pre-wrap;
+  overflow-wrap: anywhere;
   font-size: 14px;
   overflow: hidden;
   max-width: 100%;
   color: white;
-  overflow-wrap: anywhere;
   margin-top: 3px;
 }
 .other-information {
diff --git a/src/components/app/Popouts/Popouts/SettingsPanels/survey.vue b/src/components/app/Popouts/Popouts/SettingsPanels/survey.vue
index 646a65f..6c49008 100644
--- a/src/components/app/Popouts/Popouts/SettingsPanels/survey.vue
+++ b/src/components/app/Popouts/Popouts/SettingsPanels/survey.vue
@@ -31,10 +31,10 @@
         </div>
 
 
-        <div class="survey-warning" v-if="surveyErrorMessage">{{ surveyErrorMessage }}</div>
-        <div class="survey-valid" v-if="surveyValidMessage">{{ surveyValidMessage }}</div>
       </div>
     </div>
+    <div class="survey-warning" v-if="surveyErrorMessage">{{ surveyErrorMessage }}</div>
+    <div class="survey-valid" v-if="surveyValidMessage">{{ surveyValidMessage }}</div>
     <div class="button" v-if="loaded" @click="surveySubmitButton">Save</div>
   </div>
 </template>
@@ -58,9 +58,6 @@ export default {
       },
 
     };
-  },
-  computed: {
-
   },
   async mounted() {
     const { ok, error, result } = await userService.getSurvey();
@@ -141,6 +138,7 @@ export default {
 .survey {
   display: flex;
   flex-direction: column;
+  height: 100%;
 }
 .survey-inner {
   display: flex;
@@ -154,6 +152,7 @@ export default {
   flex-direction: column;
   overflow: auto;
   width: 100%;
+  height: 100%;
 }
 
 .survey-content {
@@ -164,11 +163,13 @@ export default {
   display: flex;
   flex-direction: column;
   flex: 1;
+  flex-shrink: 0;
 }
 .right {
   display: flex; 
   flex-direction: column;
   flex: 1;
+  flex-shrink: 0;
 }
 
 .dropdown {
diff --git a/src/store/modules/socketIOModule.js b/src/store/modules/socketIOModule.js
index 66ddab9..8ac7a67 100644
--- a/src/store/modules/socketIOModule.js
+++ b/src/store/modules/socketIOModule.js
@@ -154,10 +154,10 @@ const actions = {
       this._vm.$socket.emit('notification:dismiss', {channelID: data.message.channelID});
     } else {
       bus.$emit('title:change', data.message.creator.username + " sent a message.");
+      // send notification if other users message the recipient
+      if (data.message.creator.uniqueID === context.getters.user.uniqueID) return;
       desktopNotification();
     }
-    // send notification if other users message the recipient
-    if (data.message.creator.uniqueID === context.getters.user.uniqueID) return;
     const notification  = {
       channelID: data.message.channelID,
       lastMessageID: data.message.messageID,
diff --git a/src/utils/Badges.js b/src/utils/Badges.js
index 5a60dc0..60dd46e 100644
--- a/src/utils/Badges.js
+++ b/src/utils/Badges.js
@@ -19,4 +19,14 @@ module.exports = {
     icon: require('twemoji/2/svg/2764.svg'),
     color: '#dd2e44'
   },
+  4: {
+    name: 'Idea Queen',
+    icon: require('twemoji/2/svg/1f4a0.svg'),
+    color: '#78d4ff'
+  },
+  5: {
+    name: 'Bug Catcher',
+    icon: require('twemoji/2/svg/1f41b.svg'),
+    color: '#e234eb'
+  },
 }
\ No newline at end of file
diff --git a/src/utils/changelog.js b/src/utils/changelog.js
index 0eeae59..72f0de2 100644
--- a/src/utils/changelog.js
+++ b/src/utils/changelog.js
@@ -14,6 +14,20 @@
 
 const config = [
 
+  {
+    version: 5.8,
+    title: "Bug fixes",
+    shortTitle: "",
+    date: "04/08/2019",
+    headColor: "rgba(79, 38, 50, 0.77)",
+    new: [
+      "Added more badges (Bug Catcher, Idea Queen)",
+    ],
+    fix: [
+      "Fixed a bug where desktop notifications would show for your own messages.",
+      "Fixed a bug where editing custom emojis would break.",
+    ]
+  },
   {
     version: 5.7,
     title: "Redesigned survey + user pop-out",
diff --git a/src/utils/emojiParser.js b/src/utils/emojiParser.js
index e62b37d..3156f12 100644
--- a/src/utils/emojiParser.js
+++ b/src/utils/emojiParser.js
@@ -26,6 +26,17 @@ export default {
 			return x
 		});
 	},
+	emojiToShortcode: message => {
+		// replace default emojis
+		for (let emoji of emojis) {
+			const search = emoji.unicode;
+			const replace = `:${emoji.shortcodes[0]}:`
+			message = message.split(search).join(replace)
+		}
+		// replace custom emojis
+		message = message.replace(/<:([-\w]+):[-\w]+>/g, ':$1:')
+		return message
+	},
 	replaceEmojis: (string) => {
 
 		return twemoji.parse(string,