diff --git a/e107_plugins/content/content.php b/e107_plugins/content/content.php
index 376bf0938..60d5315ba 100644
--- a/e107_plugins/content/content.php
+++ b/e107_plugins/content/content.php
@@ -12,8 +12,8 @@
 |        GNU General Public License (http://gnu.org).
 |
 |		$Source: /cvs_backup/e107_0.8/e107_plugins/content/content.php,v $
-|		$Revision: 1.16 $
-|		$Date: 2007-04-18 20:31:16 $
+|		$Revision: 1.17 $
+|		$Date: 2007-04-18 20:46:04 $
 |		$Author: lisa_ $
 +---------------------------------------------------------------+
 */
@@ -359,7 +359,7 @@ function show_content_archive(){
 		$validparent	= implode(",", array_keys($array));
 		$qry			= " content_parent REGEXP '".$aa -> CONTENTREGEXP($validparent)."' ";
 		$number			= varsettrue($content_pref["content_archive_nextprev_number"], '30');
-		$order			= $aa -> getOrder();
+		$order			= $aa -> getOrder('archive');
 		$nextprevquery	= (varsettrue($content_pref["content_archive_nextprev"]) ? "LIMIT ".intval($from).",".intval($number) : "");
 		$sql1 = new db;
 
diff --git a/e107_plugins/content/handlers/content_class.php b/e107_plugins/content/handlers/content_class.php
index ae31b0ad9..1f0869660 100644
--- a/e107_plugins/content/handlers/content_class.php
+++ b/e107_plugins/content/handlers/content_class.php
@@ -12,8 +12,8 @@
 |        GNU General Public License (http://gnu.org).
 |
 |		$Source: /cvs_backup/e107_0.8/e107_plugins/content/handlers/content_class.php,v $
-|		$Revision: 1.20 $
-|		$Date: 2007-04-18 20:31:17 $
+|		$Revision: 1.21 $
+|		$Date: 2007-04-18 20:46:04 $
 |		$Author: lisa_ $
 +---------------------------------------------------------------+
 */
@@ -261,6 +261,7 @@ class content{
 		$cp['content_archive_authoremail'] = '';					//archive : section: show author email
 		$cp['content_archive_authoremail_nonmember'] = '';			//archive : show link to email of non-member author
 		$cp['content_archive_caption'] = CONTENT_LAN_84;			//caption for archive page
+		$cp['content_archive_defaultorder'] = 'orderaheading';		//default order for content items on the archive page
 
 		//TOP RATED PAGE
 		$cp['content_top_icon'] = '';								//top : section: show icon
@@ -1092,6 +1093,8 @@ class content{
 				$orderstring = ($content_pref["content_catall_defaultorder"] ? $content_pref["content_catall_defaultorder"] : "orderaheading" );
 			}elseif(isset($mode) && $mode=='cat'){
 				$orderstring = ($content_pref['content_cat_defaultorder'] ? $content_pref['content_cat_defaultorder'] : "orderaheading" );
+			}elseif(isset($mode) && $mode=='archive'){
+				$orderstring = ($content_pref['content_archive_defaultorder'] ? $content_pref['content_archive_defaultorder'] : "orderaheading" );
 			}else{
 				$orderstring = ($content_pref["content_defaultorder"] ? $content_pref["content_defaultorder"] : "orderddate" );
 			}
diff --git a/e107_plugins/content/handlers/content_form_class.php b/e107_plugins/content/handlers/content_form_class.php
index 754d6e0de..54b98305f 100644
--- a/e107_plugins/content/handlers/content_form_class.php
+++ b/e107_plugins/content/handlers/content_form_class.php
@@ -12,8 +12,8 @@
 |        GNU General Public License (http://gnu.org).
 |
 |		$Source: /cvs_backup/e107_0.8/e107_plugins/content/handlers/content_form_class.php,v $
-|		$Revision: 1.14 $
-|		$Date: 2007-04-18 20:31:17 $
+|		$Revision: 1.15 $
+|		$Date: 2007-04-18 20:46:04 $
 |		$Author: lisa_ $
 +---------------------------------------------------------------+
 */
@@ -2744,6 +2744,19 @@ class contentform{
 			$TOPIC_FIELD = $rs -> form_text("content_archive_caption", 25, $tp->toHTML($content_pref['content_archive_caption'],"","defs"), 50);
 			$text .= preg_replace("/\{(.*?)\}/e", '$\1', $TOPIC_ROW_NOEXPAND);
 
+			//content_archive_defaultorder_
+			$TOPIC_TOPIC = CONTENT_ADMIN_OPT_LAN_51;
+			$TOPIC_FIELD = "
+			".$rs -> form_select_open("content_archive_defaultorder")."
+			".$rs -> form_option(CONTENT_ORDER_LAN_1, ($content_pref['content_archive_defaultorder'] == "orderaheading" ? "1" : "0"), "orderaheading")."
+			".$rs -> form_option(CONTENT_ORDER_LAN_2, ($content_pref['content_archive_defaultorder'] == "orderdheading" ? "1" : "0"), "orderdheading")."
+			".$rs -> form_option(CONTENT_ORDER_LAN_3, ($content_pref['content_archive_defaultorder'] == "orderadate" ? "1" : "0"), "orderadate")."
+			".$rs -> form_option(CONTENT_ORDER_LAN_4, ($content_pref['content_archive_defaultorder'] == "orderddate" ? "1" : "0"), "orderddate")."
+			".$rs -> form_option(CONTENT_ORDER_LAN_9, ($content_pref['content_archive_defaultorder'] == "orderaorder" ? "1" : "0"), "orderaorder")."
+			".$rs -> form_option(CONTENT_ORDER_LAN_10, ($content_pref['content_archive_defaultorder'] == "orderdorder" ? "1" : "0"), "orderdorder")."
+			".$rs -> form_select_close();
+			$text .= preg_replace("/\{(.*?)\}/e", '$\1', $TOPIC_ROW_NOEXPAND);
+
 			$text .= $TOPIC_TABLE_END;
 
 			$text .= "