diff --git a/e107_plugins/import/admin_import.php b/e107_plugins/import/admin_import.php
index 59beb03af..dda3244b6 100644
--- a/e107_plugins/import/admin_import.php
+++ b/e107_plugins/import/admin_import.php
@@ -367,7 +367,10 @@ class import_main_ui extends e_admin_ui
 
 
 
-
+	function renderConfig()
+	{
+		
+	}
 
 
 
@@ -446,26 +449,7 @@ class import_main_ui extends e_admin_ui
 		
 		$importType = $proObj->title;
 		
-		if(method_exists($proObj,"config")) // Config Found in Class - render options from it. 
-		{
-			$ops  = $proObj->config();
-			foreach($ops as $key=>$val)
-			{
-				$text .= "<tr>
-					<td>".$val['caption']."</td>
-					<td>".$val['html'];
-				$text .= (vartrue($val['help'])) ? "<div class='field-help'>".$val['help']."</div>" : "";	
-				$text .= "</td>
-				</tr>\n";		
-			}
-			
-			if($proObj->sourceType)
-			{
-				$text .= "<input type='hidden' name='import_source' value='".$proObj->sourceType."' />\n";	
-			} 			
-					
-		}
-		else // STANDARD db Setup 
+		if($proObj->sourceType == 'db' || !$proObj->sourceType) // STANDARD db Setup 
 		{
 	    	
 	
@@ -498,6 +482,34 @@ class import_main_ui extends e_admin_ui
 	
 		}
 	
+	
+		if(method_exists($proObj,"config")) // Config Found in Class - render options from it. 
+		{
+			$ops  = $proObj->config();
+			foreach($ops as $key=>$val)
+			{
+				$text .= "<tr>
+					<td>".$val['caption']."</td>
+					<td>".$val['html'];
+				$text .= (vartrue($val['help'])) ? "<div class='field-help'>".$val['help']."</div>" : "";	
+				$text .= "</td>
+				</tr>\n";		
+			}		
+		}
+	
+	
+		if($proObj->sourceType)
+		{
+			$text .= "<input type='hidden' name='import_source' value='".$proObj->sourceType."' />\n";	
+		} 
+		else
+		{
+			$text .= "<input type='hidden' name='import_source' value='db' />";	
+		}
+			
+	
+	
+	
 	//	if($mode != 'csv')
 		{
 			$text .= "
@@ -607,7 +619,7 @@ class import_main_ui extends e_admin_ui
 		
 		if (class_exists($this->importClass))
 		{
-			$mes->addDebug("dbImport(): Class Available: ".$this->importClass);   
+			$mes->addDebug("dbImport(): Converter Class Available: ".$this->importClass);   
 			$converter = new $this->importClass;
 			$converter->init();
 		}
@@ -666,6 +678,25 @@ class import_main_ui extends e_admin_ui
 			
 			$mes->addDebug("dbImport(): Importing: ".$k);
 			
+			$exporter = new $v['classname'];		// Writes the output data
+	
+		  	if(is_object($exporter))
+			{
+				$mes->addDebug("dbImport(): Exporter Class Initiated: ".$v['classname']);	
+				
+				if(is_object($exporter->helperClass))
+				{
+					$mes->addDebug("dbImport(): Initiated Helper Class");		
+					$converter->helperClass = $exporter->helperClass;
+				}
+				
+			}
+			else
+			{
+				$mes->addDebug("dbImport(): Couldn't Initiate Class: ".$v['classname']);		
+			}
+			
+			
 		  	$result = $converter->setupQuery($k, !$this->deleteExisting);
 							
 			if ($result !== TRUE)
@@ -674,16 +705,8 @@ class import_main_ui extends e_admin_ui
 				break;
 			}
 					
-		  	$exporter = new $v['classname'];		// Writes the output data
-		  	
-		  	if(is_object($exporter))
-			{
-				$mes->addDebug("dbImport(): Class Initiated: ".$v['classname']);	
-			}
-			else
-			{
-				$mes->addDebug("dbImport(): Couldn't Initiate Class: ".$v['classname']);		
-			}
+		
+		  
 				 				 	
 			if($k == 'users')  // Do any type-specific default setting
 			{
diff --git a/e107_plugins/import/import_forum_class.php b/e107_plugins/import/import_forum_class.php
index 81dc13669..16110ece8 100644
--- a/e107_plugins/import/import_forum_class.php
+++ b/e107_plugins/import/import_forum_class.php
@@ -118,6 +118,7 @@ class forum_import
 class forumthread_import
 {
 	var $error;
+	var $forumClass;
 
 	var $defaults = array(
 			'thread_id'					=> '',
@@ -145,6 +146,7 @@ class forumthread_import
 	{
 	 // 	global $sql;
 	 //   $this->pageDB = new db;	// Have our own database object to write to the table	
+	 
 	}
 
 
@@ -241,14 +243,22 @@ class forumpost_import
 	var $mandatory = array(
 		'post_thread', 'post_forum'
 	);
-  
+	
+	var $helperClass;
+
 	// Constructor
 	function __construct()
 	{
 	 // 	global $sql;
 	 //   $this->pageDB = new db;	// Have our own database object to write to the table	
+		if(require_once(e_PLUGIN."forum/forum_class.php"))
+		{
+			e107::getMessage()->addDebug("Include forum_class");
+		}
+		
+		$this->helperClass = new e107forum();		
 	}
-
+	
 
 	// Empty the  DB - not necessary
 	function emptyTargetDB($inc_admin = FALSE)
diff --git a/e107_plugins/import/providers/phpbb3_import_class.php b/e107_plugins/import/providers/phpbb3_import_class.php
index d7a34e1d3..db42c781d 100644
--- a/e107_plugins/import/providers/phpbb3_import_class.php
+++ b/e107_plugins/import/providers/phpbb3_import_class.php
@@ -23,10 +23,33 @@ class phpbb3_import extends base_import_class
 	public $description	= 'Import phpBB3 Users and Forums';
 	public $supported	=  array('users','forum','forumthread','forumpost','forumtrack');
 	public $mprefix		= 'phpbb_';
-
+	public $sourceType 	= 'db';	
+	
 	var $catcount = 0;				// Counts forum IDs
 	var $id_map = array();			// Map of PHPBB forum IDs ==> E107 forum IDs
+	
+	private $forum_attachments = array();
+	private $forum_attachment_path = null;
+	var $helperClass; // forum class. 
+ 
+ 
+	function init()
+	{
+		$this->forum_attachment_path	= vartrue(trim($_POST['forum_attachment_path'],"/" ), false);
+	} 
+ 
+ 
   
+	function config()
+	{
+		$frm = e107::getForm();
+		
+		$var[0]['caption']	= "Path to phpBB3 Attachments folder (optional)";
+		$var[0]['html'] 	= $frm->text('forum_attachment_path',null,40,'size=xxlarge');
+		$var[0]['help'] 	= "Relative to the root folder of your e107 installation";
+
+		return $var;
+	}
   
   // Set up a query for the specified task.
   // Returns TRUE on success. FALSE on error
@@ -49,10 +72,21 @@ class phpbb3_import extends base_import_class
 				
 			case 'forumthread' :
 				$result = $this->ourDB->gen("SELECT * FROM `{$this->DBPrefix}topics`");
+				
 				if ($result === FALSE) return FALSE;	  
 			break;
 				
 			case 'forumpost' :
+								
+				if($this->ourDB->gen("SELECT * FROM `{$this->DBPrefix}attachments`"))
+				{
+					while($row = $this->ourDB->fetch(MYSQL_ASSOC))
+					{
+						$id = $row['post_msg_id'];
+						$key = $row['physical_filename'];
+						$this->forum_attachments[$id][$key] = $row['real_filename'];	
+					}
+				}
 				$result = $this->ourDB->gen("SELECT * FROM `{$this->DBPrefix}posts`");
 				if ($result === FALSE) return FALSE;	  
 			break;				
@@ -226,7 +260,7 @@ class phpbb3_import extends base_import_class
 		$target['forum_moderators']			= "";
 	
 		$target['forum_threads'] 			= $source['forum_topics'];
-		$target['forum_replies']			= "";
+		$target['forum_replies']			= $source['forum_posts'];
 		$target['forum_lastpost_user']		= $source['forum_last_poster_id'];
 		$target['forum_lastpost_user_anon']	= $source['forum_last_poster_name'];
 		$target['forum_lastpost_info']		= $source['forum_last_post_time'];
@@ -274,7 +308,7 @@ class phpbb3_import extends base_import_class
 	function copyForumPostData(&$target, &$source)
 	{
 		$target['post_id'] 					= $source['post_id'];
-		$target['post_entry'] 				= $source['post_text'];
+		$target['post_entry'] 				= $this->convertText($source['post_text']);
 		$target['post_thread'] 				= $source['topic_id'];
 		$target['post_forum'] 				= $source['forum_id'];
 	//	$target['post_status'] 				= $source[''];
@@ -284,7 +318,7 @@ class phpbb3_import extends base_import_class
 		$target['post_edit_user'] 			= $source['post_edit_user'];
 		$target['post_ip'] 					= $source['poster_ip'];
 	//	$target['post_user_anon'] 			= $source[''];
-	//	$target['post_attachments'] 		= $source[''];
+		$target['post_attachments'] 		= $this->convertAttachment($source);
 	//	$target['post_options'] 			= $source[''];
 		
 		
@@ -305,9 +339,106 @@ class phpbb3_import extends base_import_class
 		return $target;
 	}
 
+	
+	
+	function convertAttachment($row)
+	{
+		
+		if($row['post_attachment'] != 1)
+		{
+			return;
+		}
+		
+		$id = $row['post_id'];
+				
+		if(isset($this->forum_attachments[$id]))
+		{
+			$attach = array();
+			
+			$forum = $this->helperClass; // e107_plugins/forum/forum_class.php 
+			
+			if($folder = $forum->getAttachmentPath($row['poster_id'],true)) // get Path and create Folder if needed. 
+			{
+				e107::getMessage()->addDebug("Created Attachment Folder: ".$folder );
+			}
+			else
+			{
+				e107::getMessage()->addError("Couldn't find/create attachment folder for user-id: ".$row['poster_id'] );	
+			}
+			
+			foreach($this->forum_attachments[$id] as $file => $name)
+			{
+				
+				if(preg_match('#.JPG|.jpg|.gif|.png|.PNG|.GIF|.jpeg|.JPEG$#',$name))
+				{
+					$attach['img'][] = $file;	
+				}
+				else 
+				{
+					$attach['file'][] = $file;
+				}	
+				
+				if($this->forum_attachment_path) // if path entered - then move the files. 
+				{
+					$oldpath = e_BASE.$this->forum_attachment_path."/".$file;
+					$newpath = $folder.$file;
+					
+					if(rename($oldpath,$newpath))
+					{
+						e107::getMessage()->addDebug("Renamed file from <b>{$oldpath}</b> to <b>{$newpath}</b>" );	
+					}
+					else
+					{
+						e107::getMessage()->addError("Couldn't rename file from <b>{$oldpath}</b> to <b>{$newpath}</b>" );	
+					}	
+					
+				}
+				
+			}	
+			
+		}
+
+		
+		return e107::serialize($attach); // set attachments 	
+	}
 
 
 
+	function convertText($text)
+	{		
+		$text = preg_replace('#<!-- s(\S*) --><img([^>]*)><!-- s(\S*) -->#','$1',$text);	 					// Smilies to text
+		$text = preg_replace('#\[img:([^\]]*)]([^\[]*)\[/img:([^\]]*)]#', '[img]$2[/img]', $text); 				// Image Bbcodes. 
+		$text = preg_replace('#<!-- m --><a class="postlink" href="([^>]*)">([^<]*)</a><!-- m -->#','[link=$1]$2[/img]',$text);	 	// links
+		
+		$text = preg_replace('#\[attachment([^\]]*)]([^\[]*)\[/attachment:([^\]]*)]#','',$text);
+		$text = html_entity_decode($text,ENT_NOQUOTES,'UTF-8');
+		
+		/*		
+		if(preg_match_all('#\[attachment([^\]]*)]([^\[]*)\[/attachment:([^\]]*)]#',$text,$matches))
+		{	
+			$attach = array();
+			foreach($matches[2] as $val)
+			{
+				$val = strip_tags($val); // remove html comments. 
+				
+				if(preg_match('#.JPG|.jpg|.gif|.png|.PNG|.GIF|.jpeg|.JPEG$#',$val))
+				{
+					$attach['img'][] = $val;	
+				}
+				else 
+				{
+					$attach['file'][] = $val;
+				}
+			}
+			
+			
+			$text = str_replace($matches[0],'',$text); // erase attachment bbcode from text. 
+		}
+		*/
+		
+		
+		return $text;
+	}