diff --git a/administrator/components/com_kunenaimporter/CHANGELOG.php b/administrator/components/com_kunenaimporter/CHANGELOG.php
index 4274d9f..4201a0c 100644
--- a/administrator/components/com_kunenaimporter/CHANGELOG.php
+++ b/administrator/components/com_kunenaimporter/CHANGELOG.php
@@ -31,6 +31,10 @@
 
 KunenaImporter 1.7.0-DEV
 
+28-August-2011 Matias
+# [#26] Agora: Fix avatar gallery import
+# [#26] Agora: Fix subscriptions import
+
 25-August-2011 Matias
 # [#20] Add support for Joomla 1.7: make user creation to work
 
diff --git a/administrator/components/com_kunenaimporter/models/export_agora.php b/administrator/components/com_kunenaimporter/models/export_agora.php
index d552ef5..3c6a7e4 100644
--- a/administrator/components/com_kunenaimporter/models/export_agora.php
+++ b/administrator/components/com_kunenaimporter/models/export_agora.php
@@ -13,9 +13,19 @@
 
 require_once( JPATH_COMPONENT . '/models/export.php' );
 
+/**
+ * Agora Exporter Class
+ *
+ * Exports data from Agora Forum.
+ * @todo Configuration import needs some work
+ * @todo Forum ACL not exported (except for moderators)
+ * @todo Uploaded avatars are not supported
+ * @todo Ranks not exported
+ * @todo Some emoticons may be missing (images/db are not exported)
+ */
 class KunenaimporterModelExport_Agora extends KunenaimporterModelExport {
 	/**
-	 * Extension name ([a-z0-9_], wihtout 'com_' prefix)
+	 * Extension name without prefix
 	 * @var string
 	 */
 	public $extname = 'agora';
@@ -408,6 +418,7 @@ public function &exportUserprofile($start=0, $limit=0) {
 				$avatar = $profile->id.'.gif';
 			} else {
 				$avatar_path = '';
+				$avatar = '';
 			}
 			$profile->avatar = $avatar;
 			$profile->copypath =  $avatar_path;
@@ -499,16 +510,17 @@ public function &exportPollsOptions($start=0, $limit=0) {
 	}
 
 	public function countSubscriptions() {
-		$query = "SELECT COUNT(*) FROM `#__agora_subscriptions`";
+		$query = "SELECT COUNT(*) FROM #__agora_subscriptions";
 		return $this->getCount ( $query );
 	}
 
 	public function &exportSubscriptions($start = 0, $limit = 0) {
 		$query = "SELECT
 			w.topic_id AS thread,
-			u.jos_id AS userid
-		FROM `#__agora_subscriptions` AS w
-		LEFT JOIN `#__agora_users` AS u ON w.user_id=u.id";
+			u.jos_id AS userid,
+			w.emailed AS future1
+		FROM #__agora_subscriptions AS w
+		INNER JOIN #__agora_users AS u ON w.user_id=u.id";
 		$result = $this->getExportData ( $query, $start, $limit );
 		return $result;
 	}
@@ -565,11 +577,11 @@ public function &exportAvatarGalleries($start = 0, $limit = 0) {
 	protected function &getAvatarGalleries() {
 		static $galleries = false;
 		if ($galleries === false) {
-			$copypath = JPATH_ROOT.'/components/com_agora/img/pre_avatars';
+			$path = JPATH_ROOT.'/components/com_agora/img/pre_avatars';
 			$galleries = array();
-			$files = JFolder::files($copypath, '\.(?i)(gif|jpg|jpeg|png)$', true);
-			foreach ($files as $file) {
-				$galleries[$file] = "{$copypath}/{$file}";
+			$folders = JFolder::folders($path);
+			foreach ($folders as $folder) {
+				$galleries[$folder] = "{$path}/{$folder}";
 			}
 		}
 		return $galleries;