diff --git a/sigIRCv2.jar b/sigIRCv2.jar
index 128d61f..2896b1b 100644
Binary files a/sigIRCv2.jar and b/sigIRCv2.jar differ
diff --git a/src/sig/MyPanel.java b/src/sig/MyPanel.java
index fe49d42..fc65cd9 100644
--- a/src/sig/MyPanel.java
+++ b/src/sig/MyPanel.java
@@ -59,14 +59,6 @@ public class MyPanel extends JPanel implements MouseListener, ActionListener, Mo
         super.paintComponent(g);
         // Draw Text
         //int counter=18;
-        for (int i=0;i<sigIRC.twitchemoticons.size();i++) {
-        	if (sigIRC.twitchemoticons.get(i).isActive() &&
-        			sigIRC.twitchemoticons.get(i).textRefIsVisible()) {
-        		sigIRC.twitchemoticons.get(i).draw(g);
-        	} else {
-        		break;
-        	}
-        }
         if (sigIRC.panel!=null) {
 	        lastMouseX = (int)(MouseInfo.getPointerInfo().getLocation().getX()-sigIRC.panel.getLocationOnScreen().getX());
 	        lastMouseY = (int)(MouseInfo.getPointerInfo().getLocation().getY()-sigIRC.panel.getLocationOnScreen().getY());
@@ -84,6 +76,11 @@ public class MyPanel extends JPanel implements MouseListener, ActionListener, Mo
         for (Module m : sigIRC.modules) {
         	m.draw(g);
         }
+        for (int i=0;i<sigIRC.chatlogtwitchemoticons.size();i++) {
+        	if (sigIRC.chatlogtwitchemoticons.get(i).textRefIsVisible()) {
+        		sigIRC.chatlogtwitchemoticons.get(i).draw(g);
+        	}
+        }
         for (int i=0;i<sigIRC.textobj.size();i++) {
         	if (sigIRC.textobj.get(i).isActive()) {
         		if (sigIRC.overlayMode) {
@@ -99,9 +96,12 @@ public class MyPanel extends JPanel implements MouseListener, ActionListener, Mo
         		}
         	}
         }
-        for (int i=0;i<sigIRC.chatlogtwitchemoticons.size();i++) {
-        	if (sigIRC.chatlogtwitchemoticons.get(i).textRefIsVisible()) {
-        		sigIRC.chatlogtwitchemoticons.get(i).draw(g);
+        for (int i=0;i<sigIRC.twitchemoticons.size();i++) {
+        	if (sigIRC.twitchemoticons.get(i).isActive() &&
+        			sigIRC.twitchemoticons.get(i).textRefIsVisible()) {
+        		sigIRC.twitchemoticons.get(i).draw(g);
+        	} else {
+        		break;
         	}
         }
         if (!sigIRC.overlayMode) {
@@ -161,7 +161,6 @@ public class MyPanel extends JPanel implements MouseListener, ActionListener, Mo
 
 	@Override
 	public void keyTyped(KeyEvent e) {
-		
 	}
 
 	@Override
diff --git a/src/sig/modules/ChatLog/ChatLogMessage.java b/src/sig/modules/ChatLog/ChatLogMessage.java
index 2b727a3..9106e8f 100644
--- a/src/sig/modules/ChatLog/ChatLogMessage.java
+++ b/src/sig/modules/ChatLog/ChatLogMessage.java
@@ -49,7 +49,9 @@ public class ChatLogMessage {
 			usernameWidth = (int)TextUtils.calculateStringBoundsFont(this.username, sigIRC.panel.userFont).getWidth();
 		}
 		for (int i=0;i<displayMessage.size();i++) {
-			displayMessage.set(i, ReplaceMessageWithEmoticons(displayMessage.get(i)+" ",(i==0)?usernameWidth:0,i*MESSAGE_SPACING));
+			//System.out.println("displayMessage["+i+"] before: "+displayMessage.get(i));
+			displayMessage.set(i, ReplaceMessageWithEmoticons(" "+displayMessage.get(i)+" ",(i==0)?usernameWidth:0,i*MESSAGE_SPACING));
+			//System.out.println("displayMessage["+i+"] after: "+displayMessage.get(i));
 		}
 	}
 	
@@ -58,9 +60,10 @@ public class ChatLogMessage {
 		while (marker<basemsg.length()) {
 			//Find a space.
 			int space = basemsg.indexOf(" ", marker+1);
+			//System.out.println(" Marker is at position "+space+" for word \""+basemsg+"\"");
 			if (space>0) {
 				String word = basemsg.substring(marker+1, space);
-				//System.out.println("Word is '"+word+"'");
+				//System.out.println(" Word is '"+word+"'");
 				sigIRC.emoticons.addAll(sigIRC.emoticon_queue);
 				sigIRC.emoticon_queue.clear();
 				for (Emoticon e : sigIRC.emoticons) {
@@ -156,7 +159,7 @@ public class ChatLogMessage {
 		int textWidth = (int)TextUtils.calculateStringBoundsFont(rawmessage, sigIRC.panel.userFont).getWidth();
 		int maxWidth = (int)refModule.getPosition().getWidth()-BORDER_SPACING;
 		do {
-			rawmessage = BreakTextAtNextSection(rawmessage,maxWidth);
+			rawmessage = BreakTextAtNextSection(rawmessage+" ",maxWidth);
 			textWidth = (int)TextUtils.calculateStringBoundsFont(rawmessage, sigIRC.panel.userFont).getWidth();
 		} while (textWidth>maxWidth);
 		if (rawmessage.length()>0) {
@@ -177,7 +180,7 @@ public class ChatLogMessage {
 					if (textWidth<maxWidth) {
 						marker = tempmarker+1;
 					}
-					//System.out.println(msg.substring(0, marker)+" | "+textWidth);
+					System.out.println(msg.substring(0, marker)+" | "+textWidth);
 				} else {
 					marker=msg.length();
 					break;