diff --git a/addressbook/inc/export/Outlook_CSV_-_Finnish b/addressbook/inc/export/Outlook_CSV_-_Finnish
new file mode 100644
index 0000000000..a0e8a386c4
--- /dev/null
+++ b/addressbook/inc/export/Outlook_CSV_-_Finnish
@@ -0,0 +1,148 @@
+<?php
+// This file defines a set of functions and an associative array.
+// The key of the array corresponds to a header in the source
+// export file and the value of the array item will be used in
+// the creation of the output file.
+//
+// An exported Outlook file looks like this:
+//
+// Title<tab>First Name<tab>Middle Name<tab>Last Name<tab>...
+// <tab>Patrick<tab><tab>Walsh<tab>...
+//
+// Where the first line explains each optional field.  This is what
+// will be looked up in the key.
+//
+// The array need not be in any order and any fields not defined will
+// not be transferred.  If the val='+', the value will be appended to
+// the previous field and any text after the '+' will be appended 
+// before the value.  For example, the following would add a comma and
+// a space between LastName and FirstName and store it in FullName:
+//
+//	array("LastName" => "FullName","FirstName" => "+, ");
+//
+// Also start with a '#' symbol and a comma separated list will be
+// turned into a number of the same entries.
+
+	class export_conv
+	{
+		var $currentrecord = array(); //used for buffering to allow uid lines to go first
+		var $id;
+		var $type = 'csv';
+
+		var $export = array(
+			'title' => 'Tehtävänimike',
+			'n_given' => 'Etunimi',
+			'n_middle' => 'Toinen nimi',
+			'n_family' => 'Sukunimi',
+			'n_suffix' => 'Jälkiliite',
+			'org_name' => 'Yritys',
+			'org_unit' => 'Osasto',
+			'adr_one_street' => 'Lähiosoite (työ)',
+			'Business Street 2' => 'Lähiosoite (työ) 2',
+			'Business Street 3' => 'Lähiosoite (työ) 3',
+			'Business City' => 'Postitoimipaikka (työ)',
+			'Business State' => 'Sijaintitiedot (työ)',
+			'Business Postal Code' => 'Postinumero (työ)',
+			'Business Country' => 'Maa (työ)',
+			'Home Street' => 'Lähiosoite (koti)',
+			'Home City' => 'Postitoimipaikka (koti)',
+			'Home State' => 'Sijaintitiedot (koti)',
+			'Home Postal Code' => 'Postinumero (koti)',
+			'Home Country' => 'Maa (koti)',
+			'Business Fax' => 'Työfaksi',
+			'Business Phone' => 'Työpuhelin',
+			"Assistant's Phone" => 'Avustajan puhelinnumero',
+			'Car Phone' => 'Autopuhelin',
+			'ISDN' => 'ISDN',
+			'Home Phone' => 'Kotipuhelin',
+			'Mobile Phone' => 'Matkapuhelin',
+			'Pager' => 'Hakulaite',
+			'Business Phone 2' => 'Työpuhelin 2',
+			'Birthday' => 'Syntymäpäivä',
+			'E-mail Address' => 'Sähköpostiosoite',
+			'E-mail Address 2' => 'Säköpostiosoite 2',//    Note! Typo error in Finnish Outlook 2003 export addressbook to csv-file!
+			'Web Page' => 'Web-sivu',
+			'Notes' => 'Muistilaput'
+		);
+
+		// This will store the contacts object
+		var $contacts = '';
+
+		function export_start_file($buffer,$ncat_id='')
+		{
+			$this->id=-1;
+			if ($ncat_id)
+			{
+				$filter = 'tid=n,cat_id='.$ncat_id;
+			}
+			else
+			{
+				$filter = 'tid=n';
+			}
+			$this->contacts = CreateObject('phpgwapi.contacts');
+
+			$tmp = $this->contacts->read('','',array('id'=>'id'),'',$filter);
+			for ($i=0;$i<count($tmp);$i++)
+			{
+				$this->ids[$i] = $tmp[$i]['id'];
+			}
+			// $ids is now an array of all id's for this user, e.g. $ids[0] = 21, etc...
+			// $buffer is still empty
+			return $buffer;
+		}
+
+		// Read each entry
+		function export_start_record($buffer)
+		{
+			$this->id++;
+			$top = $this->contacts->read_single_entry($this->ids[$this->id],$this->qfields);
+			$this->currentrecord = $top[0];
+			return $buffer;
+		}
+
+		// Read each attribute, populate buffer
+		// name/value are the fields from the export array above
+		function export_new_attrib($buffer,$name,$value)
+		{
+			if ($this->export[$name])
+			{
+				$buffer[$this->id][$this->export[$name]] = $value;
+				//echo '<br>'.$this->id.' - '.$this->export[$name].': '.$buffer[$this->id][$this->export[$name]];
+			}
+			return $buffer;
+		}
+
+		// Tack on some extra values
+		function export_end_record($buffer)
+		{
+			return $buffer;
+		}
+
+		function export_end_file($buffer)
+		{
+			// Build the header for the file (field list)
+			reset($this->export);
+			while (list($name,$value)=each($this->export))
+			{
+				$entries .= $value . ',';
+			}
+			$entries = substr($entries,0,-1);
+			$entries .= "\r\n";
+
+			// Now add all the data
+			reset($this->ids);
+			for ($i=0;$i<count($this->ids);$i++)
+			{
+				reset($this->export);
+				while (list($name,$value)=each($this->export))
+				{
+					$entries .= $buffer[$i][$value] . ',';
+				}
+				$entries = substr($entries,0,-1);
+				$entries .= "\r\n";
+			}
+			$buffer = $entries;
+			return $buffer;
+		}
+	}
+?>
diff --git a/addressbook/inc/import/Import_from_Outlook_-_Finnish b/addressbook/inc/import/Import_from_Outlook_-_Finnish
new file mode 100644
index 0000000000..cd62f3b704
--- /dev/null
+++ b/addressbook/inc/import/Import_from_Outlook_-_Finnish
@@ -0,0 +1,127 @@
+<?php
+// This file defines a set of functions and an associative array.
+// The key of the array corresponds to a header in the source
+// import file and the value of the array item will be used in
+// the creation of the output file.
+//
+// An exported Outlook file looks like this:
+//
+// Title<tab>First Name<tab>Middle Name<tab>Last Name<tab>...
+// <tab>Patrick<tab><tab>Walsh<tab>...
+//
+// Where the first line explains each optional field.  This is what
+// will be looked up in the key.
+//
+// The array need not be in any order and any fields not defined will
+// not be transferred.  If the val='+', the value will be appended to
+// the previous field and any text after the '+' will be appended
+// before the value.  For example, the following would add a comma and
+// a space between LastName and FirstName and store it in FullName:
+//
+//	array('LastName' => 'FullName','FirstName' => '+, ');
+//
+// Also start with a '#' symbol and a comma separated list will be
+// turned into a number of the same entries.
+
+  /* $Id$ */
+
+	class import_conv
+	{
+		var $currentrecord = array(); //used for buffering to allow uid lines to go first
+		var $id;
+		var $type = 'csv';
+
+		var $import = array(
+			'Tehtävänimike' => 'title',
+			'Etunimi' => 'n_given',
+			'Toinen nimi' => 'n_middle',
+			'Sukunimi' => 'n_family',
+			'Jälkiliite' => 'n_suffix',
+			'Yritys' => 'org_name',
+			'Osasto' => 'org_unit',
+			'Lähiosoite (työ)' => 'adr_one_street',
+			'Lähiosoite (työ) 2' => 'address2',
+			'Lähiosoite (työ) 3' => 'address3',
+			'Postitoimipaikka (työ)' => 'adr_one_locality',
+			'Sijaintitiedot (työ)' => 'adr_one_region',
+			'Postinumero (työ)' => 'adr_one_postalcode',
+			'Maa (työ)' => 'adr_one_country',
+			'Lähiosoite (koti)' => 'adr_two_street',
+			'Postitoimipaikka (koti)' => 'adr_two_locality',
+			'Sijaintitiedot (koti)' => 'adr_two_region',
+			'Postinumero (koti)' => 'adr_two_postalcode',
+			'Maa (koti)' => 'adr_two_country',
+			'Työfaksi' => 'tel_fax',
+			'Työpuhelin' => 'tel_work',
+			'Avustajan puhelinnumero' => 'tel_msg',
+			'Autopuhelin' => 'tel_car',
+			'ISDN' => 'tel_isdn',
+			'Kotipuhelin' => 'tel_home',
+			'Matkapuhelin' => 'tel_cell',
+			'Hakulaite' => 'tel_pager',
+			'Työpuhelin 2' => 'ophone',
+			'Syntymäpäivä' => 'bday',
+			'Sähköpostiosoite' => 'email',
+			'Säköpostiosoite 2' => 'email_home',//    Note! Typo error in Finnish Outlook 2003 export addressbook to csv-file!
+			'Web-sivu' => 'url',
+			'Muistilaput' => 'note'
+		);
+
+		function import_start_file($buffer)
+		{
+			return $buffer;
+		}
+
+		function import_start_record($buffer)
+		{
+			$top = array();
+			++$this->id;
+			$this->currentrecord = $top;
+			return $buffer;
+		}
+
+		function import_new_attrib($buffer,$name,$value)
+		{
+			$value = trim($value);
+			$value = str_replace('\n','<BR>',$value);
+			$value = str_replace('\r','',$value);
+			$this->currentrecord += array($name => $value);
+
+			return $buffer;
+		}
+
+		function import_end_record($buffer)
+		{
+			$buffer[$this->id] = '';
+			while(list($name, $value) = each($this->currentrecord))
+			{
+				$buffer[$this->id][$name] = $value;
+				//echo '<br>'.$name.' => '.$value;
+			}
+			return $buffer;
+		}
+
+		function import_end_file($buffer,$access='private',$cat_id=0)
+		{
+			$contacts = CreateObject('phpgwapi.contacts');
+			//echo '<br>';
+			for($i=1;$i<=count($buffer);$i++)
+			{
+				while(list($name,$value) = @each($buffer[$i]))
+				{
+					//echo '<br>'.$i.': '.$name.' => '.$value;
+					$entry[$i][$name] = $value;
+				}
+				$entry[$i]['email_type']      = 'INTERNET';
+				$entry[$i]['email_home_type'] = 'INTERNET';
+				$entry[$i]['adr_one_type']    = 'intl';
+				$entry[$i]['adr_two_type']    = 'intl';
+				$entry[$i]['fn'] = $entry[$i]['n_given'] . ' ' . $entry[$i]['n_family'];
+				//echo '<br>';
+				$contacts->add($GLOBALS['egw_info']['user']['account_id'],$entry[$i],$access,$cat_id);
+			}
+			$num = $i - 1;
+			return lang('Successfully imported %1 records into your addressbook.',$num);
+		}
+	}
+?>