diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java
index e9cfd684a..0ccafc8c6 100644
--- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java
+++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java
@@ -6,7 +6,6 @@ import noppes.npcs.client.Client;
 import noppes.npcs.client.NoppesUtil;
 import noppes.npcs.client.gui.global.GuiNPCManageDialogs;
 import noppes.npcs.client.gui.global.GuiNPCQuestSelection;
-import noppes.npcs.client.gui.global.SubGuiNPCQuestSelection;
 import noppes.npcs.client.gui.util.*;
 import noppes.npcs.constants.EnumPacketServer;
 import noppes.npcs.controllers.data.Dialog;
@@ -18,7 +17,7 @@ public class SubGuiNpcDialog extends SubGuiInterface implements ISubGuiListener,
 	public int dialogCategoryID;
 	public Dialog dialog;
 	private final GuiNPCManageDialogs parent;
-	private SubGuiNpcSoundSelection gui;
+	private GuiNpcSoundSelection gui;
 	private GuiNPCQuestSelection questSelection;
 
 	public SubGuiNpcDialog(GuiNPCManageDialogs parent, Dialog dialog, int catId)
@@ -107,7 +106,9 @@ public class SubGuiNpcDialog extends SubGuiInterface implements ISubGuiListener,
 			initGui();
 		}
 		if(id == 9 && dialog.id >= 0){
-			setSubGui(gui = new SubGuiNpcSoundSelection(this, getTextField(2).getText()));
+			gui = new GuiNpcSoundSelection(getParent(), getTextField(2).getText());
+			gui.listener = this;
+			NoppesUtil.openGUI(player, gui);
 		}
 		if(id == 10){
 			setSubGui(new SubGuiNpcCommand(dialog.command));
@@ -162,9 +163,12 @@ public class SubGuiNpcDialog extends SubGuiInterface implements ISubGuiListener,
 			SubGuiNpcTextArea gui = (SubGuiNpcTextArea) subgui;
 			dialog.text = gui.text;
 		}
-		if(subgui instanceof SubGuiNpcCommand){
+		else if(subgui instanceof SubGuiNpcCommand){
 			dialog.command = ((SubGuiNpcCommand) subgui).command;
 		}
+		else if(subgui instanceof SubGuiMailmanSendSetup){
+			initGui();
+		}
 	}
 
 	@Override
diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcQuest.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcQuest.java
index dae24969f..51f510e72 100644
--- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcQuest.java
+++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcQuest.java
@@ -199,6 +199,9 @@ public class SubGuiNpcQuest extends SubGuiInterface implements ISubGuiListener,
 			SubGuiNpcCommand sub = (SubGuiNpcCommand) subgui;
 			quest.command = sub.command;
 		}
+		else if(subgui instanceof SubGuiMailmanSendSetup){
+			initGui();
+		}
 	}
 
 	@Override
diff --git a/src/main/java/noppes/npcs/client/gui/global/SubGuiNPCQuestSelection.java b/src/main/java/noppes/npcs/client/gui/global/SubGuiNPCQuestSelection.java
deleted file mode 100644
index 987bda69e..000000000
--- a/src/main/java/noppes/npcs/client/gui/global/SubGuiNPCQuestSelection.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package noppes.npcs.client.gui.global;
-
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
-import noppes.npcs.client.Client;
-import noppes.npcs.client.NoppesUtil;
-import noppes.npcs.client.gui.util.*;
-import noppes.npcs.constants.EnumPacketServer;
-import noppes.npcs.entity.EntityNPCInterface;
-
-import java.util.HashMap;
-import java.util.Vector;
-
-public class SubGuiNPCQuestSelection extends SubGuiInterface implements IScrollData
-{
-	private GuiNPCStringSlot slot;
-	private GuiScreen parent;
-	private HashMap<String,Integer> data  = new HashMap<String,Integer>();
-	private int quest;
-	private boolean selectCategory = true;
-	public GuiSelectionListener listener;
-
-
-    public SubGuiNPCQuestSelection(EntityNPCInterface npc, GuiScreen parent, int quest)
-    {
-    	drawDefaultBackground = false;
-		title = "Select Quest Category";
-		this.parent = parent;
-    	this.quest = quest;
-    	
-    	if(quest >= 0){
-    		Client.sendData(EnumPacketServer.QuestsGetFromQuest, quest);
-    		selectCategory = false;
-    		title = "Select Quest";
-    	}else
-    		Client.sendData(EnumPacketServer.QuestCategoriesGet, quest);
-    	
-    	if(parent instanceof GuiSelectionListener)
-    		listener = (GuiSelectionListener) parent;
-    }
-
-	public String getSelected(){
-		return slot.selected;
-	}
-
-    public void initGui()
-    {
-        super.initGui();
-        Vector<String> list = new Vector<String>();
-        
-        slot = new GuiNPCStringSlot(list,this,false,18);
-        slot.registerScrollButtons(4, 5);
-        
-
-    	this.addButton(new GuiNpcButton(2, width / 2 -100, height - 41,98, 20, "gui.back"));
-    	this.addButton(new GuiNpcButton(4, width / 2  + 2, height - 41,98, 20, "mco.template.button.select"));
-    }
-
-
-    public void drawScreen(int i, int j, float f)
-    {
-    	slot.drawScreen(i, j, f);
-        super.drawScreen(i, j, f);
-    }
-
-	protected void actionPerformed(GuiButton guibutton)
-    {
-		int id = guibutton.id;
-        if(id == 2)
-        {
-        	if(selectCategory){
-            	close();
-        	}else{
-    			title = "Select Quest Category";
-        		selectCategory = true;
-        		Client.sendData(EnumPacketServer.QuestCategoriesGet, quest);
-        	}
-        }
-        if(id == 4)
-        {
-        	doubleClicked();
-        }
-    }
-
-	public void doubleClicked() {
-    	if(slot.selected == null || slot.selected.isEmpty())
-    		return;
-		if(selectCategory){
-			selectCategory = false;
-			title = "Select Quest";
-			Client.sendData(EnumPacketServer.QuestsGet, data.get(slot.selected));
-		}
-		else{
-			quest = data.get(slot.selected);
-			close();
-		}
-	}
-
-	public void save() {
-		if(quest >= 0){
-			if(listener != null){
-				listener.selected(quest, slot.selected);
-			}
-		}
-	}
-
-	@Override
-	public void setData(Vector<String> list, HashMap<String, Integer> data) {
-		this.data = data;
-		this.slot.setList(list);
-		if(quest >= 0)
-			for(String name : data.keySet())
-				if(data.get(name) == quest)
-					slot.selected = name;
-	}
-
-	@Override
-	public void setSelected(String selected) {
-		
-	}
-
-}