diff --git a/application/libraries/DocsboxLib.php b/application/libraries/DocsboxLib.php
index 2b0715513..ce43f1bc5 100644
--- a/application/libraries/DocsboxLib.php
+++ b/application/libraries/DocsboxLib.php
@@ -39,8 +39,9 @@ class DocsboxLib
 	/**
 	 * Static method used to convert a document using a Docsbox installation (local/remote) over the network
 	 * It return 0 on success and any other integer on error
+	 * NOTE: currently format is not supported
 	 */
-	public static function convert($inputFileName, $outputFileName)
+	public static function convert($inputFileName, $outputFileName, $format = 'pdf')
 	{
 		// Posts the file to docsbox
 		$queueId = self::_postFile($inputFileName); 
diff --git a/application/libraries/DocumentLib.php b/application/libraries/DocumentLib.php
index 98e546b4e..d78a9c0df 100644
--- a/application/libraries/DocumentLib.php
+++ b/application/libraries/DocumentLib.php
@@ -14,20 +14,27 @@ class DocumentLib
 		// Gets CI instance
 		$this->ci =& get_instance();
 
-		exec('unoconv --version', $ret_arr);
-
-		if(isset($ret_arr[0]))
+		if (defined('DOCSBOX_ENABLED') && DOCSBOX_ENABLED === true)
 		{
-			$hlp = explode(' ', $ret_arr[0]);
-			if(isset($hlp[1]))
-			{
-				$this->unoconv_version = $hlp[1];
-			}
-			else
-				show_error('Could not get Unoconv Version');
+			// Use docsbox!!
 		}
 		else
-			show_error('Unoconv not found - Please install Unoconv');
+		{
+			exec('unoconv --version', $ret_arr);
+
+			if(isset($ret_arr[0]))
+			{
+				$hlp = explode(' ', $ret_arr[0]);
+				if(isset($hlp[1]))
+				{
+					$this->unoconv_version = $hlp[1];
+				}
+				else
+					show_error('Could not get Unoconv Version');
+			}
+			else
+				show_error('Unoconv not found - Please install Unoconv');
+		}
 	}
 
 	/**
@@ -57,9 +64,16 @@ class DocumentLib
 			case 'application/vnd.ms-word':
 			case 'application/vnd.oasis.opendocument.text':
 			case 'text/plain':
-				// Unoconv Version 0.6 seems to fail on converting TXT Files
-				if ($this->unoconv_version == '0.6')
-					return error();
+				if (defined('DOCSBOX_ENABLED') && DOCSBOX_ENABLED === true)
+				{
+					// Use docsbox
+				}
+				else
+				{
+					// Unoconv Version 0.6 seems to fail on converting TXT Files
+					if ($this->unoconv_version == '0.6')
+						return error();
+				}
 
 				$ret = $this->convert($filename, $outFile, 'pdf');
 				if(isSuccess($ret))
@@ -123,13 +137,25 @@ class DocumentLib
 	 */
 	public function convert($inFile, $outFile, $format)
 	{
-		if ($this->unoconv_version == '0.6')
-			$command = 'unoconv -f %1$s  %3$s > %2$s';
-		else
-			$command = 'unoconv -f %s --output %s %s 2>&1';
-		$command = sprintf($command, $format, $outFile, $inFile);
+		$ret = 0;
 
-		exec($command, $out, $ret);
+		// If it is set to use docsbox
+		if (defined('DOCSBOX_ENABLED') && DOCSBOX_ENABLED === true)
+		{
+			require_once(dirname(__FILE__).'/../application/libraries/DocsboxLib.php');
+
+			$ret = DocsboxLib::convert($inFile, $outFile, $format);
+		}
+		else // otherwise use unoconv
+		{
+			if ($this->unoconv_version == '0.6')
+				$command = 'unoconv -f %1$s  %3$s > %2$s';
+			else
+				$command = 'unoconv -f %s --output %s %s 2>&1';
+			$command = sprintf($command, $format, $outFile, $inFile);
+
+			exec($command, $out, $ret);
+		}
 
 		if ($ret != 0)
 		{