diff --git a/addon-liam_conversationFolders.xml b/addon-liam_conversationFolders.xml
index edc2efd..c60763a 100644
--- a/addon-liam_conversationFolders.xml
+++ b/addon-liam_conversationFolders.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<addon addon_id="liam_conversationFolders" title="Conversation Folders" version_string="1.3.1" version_id="1030170" url="https://xf-liam.com/categories/conversation-folders.177/" install_callback_class="LiamW_ConversationFolders_Installer" install_callback_method="install" uninstall_callback_class="LiamW_ConversationFolders_Installer" uninstall_callback_method="uninstall">
+<addon addon_id="liam_conversationFolders" title="Conversation Folders" version_string="1.3.2" version_id="1030270" url="https://xf-liam.com/categories/conversation-folders.177/" install_callback_class="LiamW_ConversationFolders_Installer" install_callback_method="install" uninstall_callback_class="LiamW_ConversationFolders_Installer" uninstall_callback_method="uninstall">
   <admin_navigation/>
   <admin_permissions/>
   <admin_style_properties/>
@@ -67,6 +67,7 @@
     <phrase title="liam_conversationFolders_confirm_deletion_of_conversation_folder" version_id="10000" version_string="1.0.0"><![CDATA[Confirm deletion of conversation folder]]></phrase>
     <phrase title="liam_conversationFolders_delete_folder" version_id="10000" version_string="1.0.0"><![CDATA[Delete Folder]]></phrase>
     <phrase title="liam_conversationFolders_edit_folder" version_id="10000" version_string="1.0.0"><![CDATA[Edit Folder]]></phrase>
+    <phrase title="liam_conversationFolders_folder" version_id="1030170" version_string="1.3.1"><![CDATA[Folder]]></phrase>
     <phrase title="liam_conversationFolders_folder_description" version_id="10000" version_string="1.0.0"><![CDATA[Folder Description]]></phrase>
     <phrase title="liam_conversationFolders_folder_title" version_id="10000" version_string="1.0.0"><![CDATA[Folder Title]]></phrase>
     <phrase title="liam_conversationFolders_folder_tools" version_id="10000" version_string="1.0.0"><![CDATA[Folder Tools]]></phrase>
@@ -316,6 +317,32 @@
 	<input type="hidden" name="redirect" value="{$redirect}" />
 	<input type="hidden" name="_xfToken" value="{$visitor.csrf_token_page}" />
 </form>]]></template>
+    <template title="liam_conversationFolders_move" version_id="1030170" version_string="1.3.1"><![CDATA[<xen:title>{xen:phrase liam_conversationFolders_move_conversation}: {$conversation.title}</xen:title>
+
+<form action="{xen:link 'conversations/move'}" method="post" class="xenForm formOverlay">
+	<dl class="ctrlUnit">
+		<dt><label for="ctrl_conversation_folder_id">{xen:phrase liam_conversationFolders_folder}:</label></dt>
+		<dd>
+			<select name="conversation_folder_id" class="textCtrl" id="ctrl_conversation_folder_id">
+				<option value="0">({xen:phrase liam_conversationFolders_no_folder})</option>
+				<xen:foreach loop="$conversationFolders" value="$conversationFolder">
+					<option value="{$conversationFolder.conversation_folder_id}" {xen:selected '{$conversation.conversation_folder_id} == {$conversationFolder.conversation_folder_id}'}>{$conversationFolder.title}</option>
+				</xen:foreach>
+			</select>
+		</dd>
+	</dl>
+
+	<dl class="ctrlUnit submitUnit">
+		<dt></dt>
+		<dd><input type="submit" name="save" value="{xen:phrase liam_conversationFolders_move_conversation}" accesskey="s" class="button primary" /></dd>
+	</dl>
+
+	<input type="hidden" name="conversation_id" value="{$conversation.conversation_id}" />
+
+	<input type="hidden" name="_xfConfirm" value="1" />
+	<input type="hidden" name="redirect" value="{$redirect}" />
+	<input type="hidden" name="_xfToken" value="{$visitor.csrf_token_page}" />
+</form>]]></template>
     <template title="liam_conversationFolders_wf_block" version_id="1020070" version_string="1.2.0"><![CDATA[<xen:if is="{$canUseConversationFolders}">
 	<xen:require css="liam_conversationFolders_block.css" />
 
@@ -356,9 +383,9 @@
 		</dl>]]></find>
       <replace><![CDATA[$0
 
-<xen:if is="{$canUseConversationFolders}">
+<xen:if is="{$canUseConversationFolders} && {$conversationFolders}">
 <dl class="ctrlUnit">
-	<dt><label for="ctrl_conversation_folder">{xen:phrase liam_conversationFolders}</label></dt>
+	<dt><label for="ctrl_conversation_folder">{xen:phrase liam_conversationFolders_folder}:</label></dt>
 	<dd>
 		<select name="conversation_folder_id" class="textCtrl" id="ctrl_conversation_folder">
 			<option value="0">({xen:phrase liam_conversationFolders_no_folder})</option>
diff --git a/upload/library/LiamW/ConversationFolders/Extend/ControllerPublic/Conversation.php b/upload/library/LiamW/ConversationFolders/Extend/ControllerPublic/Conversation.php
index 4e36743..6c8d2f0 100644
--- a/upload/library/LiamW/ConversationFolders/Extend/ControllerPublic/Conversation.php
+++ b/upload/library/LiamW/ConversationFolders/Extend/ControllerPublic/Conversation.php
@@ -274,12 +274,8 @@ protected function _getConversationListData(array $extraConditions = array())
 			XenForo_Input::UINT)
 		)
 		{
-			$viewParams['pageNavParams'] = array(
-				'_params' => array(
-					'conversation_folder_id' => $this->_input->filterSingle('conversation_folder_id',
-						XenForo_Input::UINT)
-				)
-			);
+			$viewParams['pageRoute'] = XenForo_Link::buildPublicLink('conversations/folder',
+				array('conversation_folder_id' => $conversationFolderId));
 		}
 
 		if (!isset($extraConditions['conversation_folder_id']) && !XenForo_Application::getOptions()->liam_conversationFolders_show_all)
diff --git a/upload/library/LiamW/ConversationFolders/Extend/Route/Prefix/Conversations.php b/upload/library/LiamW/ConversationFolders/Extend/Route/Prefix/Conversations.php
index f82e12b..c70f6e5 100644
--- a/upload/library/LiamW/ConversationFolders/Extend/Route/Prefix/Conversations.php
+++ b/upload/library/LiamW/ConversationFolders/Extend/Route/Prefix/Conversations.php
@@ -4,7 +4,7 @@ class LiamW_ConversationFolders_Extend_Route_Prefix_Conversations extends XFCP_L
 {
 	public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
 	{
-		if (preg_match('/\.\d+\/folder\/?/', $routePath))
+		if (preg_match('/\.?\d+\/folder\/?/', $routePath))
 		{
 			$action = $router->resolveActionWithIntegerParam($routePath, $request, 'conversation_folder_id');
 			$action = $router->resolveActionAsPageNumber($action, $request);
diff --git a/upload/library/LiamW/ConversationFolders/FileSums.php b/upload/library/LiamW/ConversationFolders/FileSums.php
index e556056..8b65433 100644
--- a/upload/library/LiamW/ConversationFolders/FileSums.php
+++ b/upload/library/LiamW/ConversationFolders/FileSums.php
@@ -14,12 +14,12 @@ public static function getHashes()
 	{
 		return array(
 			'library/LiamW/ConversationFolders/DataWriter/ConversationFolder.php' => '92a045ea98f930cc94ff617766920eaf',
-			'library/LiamW/ConversationFolders/Extend/ControllerPublic/Conversation.php' => '5b9f4f89866e21dfcab53cd40380147f',
+			'library/LiamW/ConversationFolders/Extend/ControllerPublic/Conversation.php' => 'fa93df1538c69ec0e7f8258fc1605df4',
 			'library/LiamW/ConversationFolders/Extend/ControllerPublic/InlineMod/Conversation.php' => '74df5cf4c2eb83a7dec3bfc4ab24d4f4',
 			'library/LiamW/ConversationFolders/Extend/DataWriter/ConversationMaster.php' => '2aa64a9720ef93ba02d6f4f01bdcff86',
 			'library/LiamW/ConversationFolders/Extend/Model/Conversation.php' => '93b7057787050810a76151f4200cab7d',
 			'library/LiamW/ConversationFolders/Extend/Model/InlineMod/Conversation.php' => '6821d4f5443504735a65e898f1cff48e',
-			'library/LiamW/ConversationFolders/Extend/Route/Prefix/Conversations.php' => '96be657bae4ca42c166becbaa48f0887',
+			'library/LiamW/ConversationFolders/Extend/Route/Prefix/Conversations.php' => '7a04737bafb2acea7c7e72d3661bc467',
 			'library/LiamW/ConversationFolders/Installer.php' => 'dd94fbd12b1bea327f67eee90ef58e1b',
 			'library/LiamW/ConversationFolders/Listener.php' => 'd5d00054a221703559cc09840f40245e',
 			'library/LiamW/ConversationFolders/Model/ConversationFolder.php' => 'd1255bbf8aad254ce29a6da2d9b291a2',