Removed old evolution scripts

78 files changed, 0 insertions, 4840 deletions

diff --git a/evolution/IMAGES/attachment_refimg.png b/evolution/IMAGES/attachment_refimg.png
deleted file mode 100644
index bd26d0f..0000000
--- a/evolution/IMAGES/attachment_refimg.png
+++ /dev/null
diff --git a/evolution/IMAGES/composemail_refimg.png b/evolution/IMAGES/composemail_refimg.png
deleted file mode 100644
index 9c6f72b..0000000
--- a/evolution/IMAGES/composemail_refimg.png
+++ /dev/null
diff --git a/evolution/IMAGES/forwardmail_refimg.png b/evolution/IMAGES/forwardmail_refimg.png
deleted file mode 100644
index 84d46f1..0000000
--- a/evolution/IMAGES/forwardmail_refimg.png
+++ /dev/null
diff --git a/evolution/IMAGES/replymail_refimg.png b/evolution/IMAGES/replymail_refimg.png
deleted file mode 100644
index 3cf3252..0000000
--- a/evolution/IMAGES/replymail_refimg.png
+++ /dev/null
diff --git a/evolution/README b/evolution/README
deleted file mode 100644
index 60182ec..0000000
--- a/evolution/README
+++ /dev/null
@@ -1,23 +0,0 @@
-+ In this release we have provided test scripts for Evolution-2.3.7 mailer automated testing
-
-+ For all the verifications involving image comparision it is necessary to replace the following files with those images taken in the testing scenario. Please save these file in the <LDTP-HOME>/pyautosuite/evolution/IMAGES
-	* composemail_refimg.png
-	* attachmail_refimg.png
-	* forwardmail_refimg.png
-	* replymail_refimg.png
-
-+ Please make sure that all the image files are in .png format.
-
-+ Please make sure that all tha .dat files contain the correct data for the scenario in which the testing is undertaken.
-
-+ We have provided test scripts for Evolution-2.3.7 Calendar automated testing of the following actions
-	* Create and verify meeting
-	* Create and verify appointment
-	* Create and configure a web calendar
-
-+ Please make sure that the test cases used are not present already in the calendar
-
-+ Please make sure that all the .dat files contain the correct data for the scenario in which the testing is undertaken.
-  For example: The entry 'nags@dell.net' should be replaced with the test account using which testing is undertaken, in 
-  all .dat files.
-+ Please note that if a field in a .dat file is optional it is necessary to include '$' as placeholder for that value.
\ No newline at end of file
diff --git a/evolution/attachment_refimg.png b/evolution/attachment_refimg.png
deleted file mode 100644
index bd26d0f..0000000
--- a/evolution/attachment_refimg.png
+++ /dev/null
diff --git a/evolution/autocompletion.dat b/evolution/autocompletion.dat
deleted file mode 100644
index fc22bdd..0000000
--- a/evolution/autocompletion.dat
+++ /dev/null
@@ -1,2 +0,0 @@
-mubeen
-Jukaku Mubeen
diff --git a/evolution/autocompletion.py b/evolution/autocompletion.py
deleted file mode 100644
index ddee5b3..0000000
--- a/evolution/autocompletion.py
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/python
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-# 
-#  Author:
-#     Bhargavi  <kbhargavi_83@yahoo.co.in>
-#     Premkumar <jpremkumar@novell.com>
-# 
-#  Copyright 2004 Novell, Inc.
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-# 
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-# 
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the 
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330, 
-#  Boston, MA 02111-1307, USA. 
-#
-
-#To check for autocompletion 
-def test_autocompletion (first_name,full_name):
-    try:
-        selectmenuitem ('evolution', 'mnuTools;mnuMail')
-        time.sleep(3)
-        selectmenuitem ('evolution', 'mnuFile;mnuFileNew;mnuMailMessage')
-        time.sleep(3)
-        if guiexist ('Composeamessage') == 0:
-            log('Compose message window does not appear','error')
-            raise LdtpExecutionError (0)
-        else:
-            #FIXME: currently I am not taking care of the case when the
-            #given first_name is not in address book. It can be done 
-            #after the is_focuson method is implemented in text.c
-            grabfocus ('Composeamessage','txtTo')
-            typekey (first_name)
-            time.sleep(3)
-            #selecting the correct to address from the list of suggestions
-            typekey ('<down>')
-            typekey ('<return>')
-            time.sleep(2)
-            cur_to = gettextvalue ('Composeamessage','txtTo')
-            print cur_to
-            i = 2
-            while cur_to != full_name:
-                settextvalue ('Composeamessage','txtTo','')
-                grabfocus ('Composeamessage','txtTo')
-                typekey (first_name)
-                time.sleep (2)
-                for j in range(0,i):
-                    typekey ('<down>')
-                typekey ('<return>')
-                if verifysettext ('Composeamessage','txtTo',cur_to) == 1:
-                    break
-                else:
-                    cur_to = gettextvalue ('Composeamessage','txtTo')
-                    i = i + 1
-            if cur_to == first_name:
-                print 'Autocompletion verification succeeded'
-                log ('Autocompletion verification','pass')
-            else:
-                log ('Autocompletion verification succeeded but failed to find given To id',
-                     'warning')
-                log ('Autocompletion verification','pass')
-                selectmenuitem ('Composeamessage','mnuFile;mnuClose')
-                time.sleep(3)
-                if guiexist ('Composeamessage') == 1:
-                    log('Compose message window does not close','error')
-                    raise LdtpExecutionError (0)
-    except ldtp.error, msg:
-        print 'Compose new message with autocompletion failed ', str (msg)
-        log ('Compose new message with autocompletion failed', 'Fail' );
-
-#Reading Input from File
-file = open('autocompletion.dat','r')
-record = file.readlines();
-first_name = record[0].strip()
-full_name = record[1].strip()
-#to = record[2].strip()
-
-log ('autocompletion verification','Start')
-time.sleep(3)
-test_autocompletion (first_name,full_name)
-time.sleep(3)
-log ('autocompletion verification','end')
diff --git a/evolution/change_draft.dat b/evolution/change_draft.dat
deleted file mode 100644
index 5912676..0000000
--- a/evolution/change_draft.dat
+++ /dev/null
@@ -1,8 +0,0 @@
-junk
-0
-ldtp@scooby.net
-test
-shaheed@scooby.net
-khasim@scooby.net
-saving as draft message
-body of the draft
diff --git a/evolution/change_draft.py b/evolution/change_draft.py
deleted file mode 100644
index 9a521b5..0000000
--- a/evolution/change_draft.py
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Khasim Shaheed <sshaik@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-
-# Change the default draft folder and verify
-import time
-
-#Change the default draft folder
-def change_draft (new_draft, index, account):
-	try:
-		selectmenuitem ('Evolution-Mail', 'mnuView;mnuWindow;mnuMail')
-		time.sleep (3)
-		selectmenuitem ('Evolution-Mail', 'mnuEdit;mnuPreferences')
-		time.sleep (3)
-		if guiexist ('dlgEvolutionSettings') == 1:
-			selectrowindex ('dlgEvolutionSettings', 'tblAccounts', index)	
-			click ('dlgEvolutionSettings', 'btnEdit')
-			time.sleep (3)
-			if guiexist ('dlgAccountEditor') == 1:
-				selecttab ('dlgAccountEditor', 'ptlAccountEditor', '3')
-				click ('dlgAccountEditor', 'btnDrafts')	
-				time.sleep (3)
-				if guiexist ('dlgSelectFolder') == 1:
-					click ('dlgSelectFolder', 'btnNew')
-					time.sleep (3)
-					if guiexist ('dlgCreateNewFolder') == 1:
-                				settextvalue('dlgCreateNewFolder', 'txtFoldername', new_draft)
-                				selectrow ('dlgCreateNewFolder', 'treetblMailFolderTree', account)
-                				click ('dlgCreateNewFolder', 'btnCreate')
-					else:
-						log ('Create New Folder dialog does not appear', 'error')
-						log ('Change Draft Folder', 'fail')
-                			selectrow ('dlgSelectFolder', 'treetblMailFolderTree', new_draft)
-                			click ('dlgSelectFolder', 'btnOK')
-				else:
-					log ('Select Folder dialog does not appear', 'error')
-                                        log ('Change Draft Folder', 'fail')
-				click ('dlgAccountEditor', 'btnOK')
-			else:
-				log ('Account Editor dialog does not appear', 'error')
-                                log ('Change Draft Folder', 'fail')
-			click ('dlgEvolutionSettings', 'btnClose')
-			log ('Change Draft Folder', 'pass')
-		else:
-			log ('Evolution Settings dialog does not appear', 'error')
-                        log ('Change Draft Folder', 'fail')
-	except error, msg:
-		log (str (msg), 'error')
-                log ('Change Draft Folder', 'fail')
-
-#Verify whether draft folder has been changed or not
-def verify_draft (new_draft, to_address, cc_address, msg_subject, msg_body):
-	try:
-		selectmenuitem ('Evolution-Mail', 'mnuFile;mnuNew;mnuMailMessage')
-		if guiexist ('frmComposeamessage') == 1:
-			settextvalue ('frmComposeamessage', 'txtTo', to_address) 
-			if verifycheck ('frmComposeamessage', 'mnuView;mnuCcField') == 0:
-				check ('frmComposeamessage', 'mnuView;mnuCcField')
-			settextvalue ('frmComposeamessage', 'txtCc', cc_address) 
-			settextvalue ('frmComposeamessage', 'txtSubject', msg_subject)
-			setcontext ('Compose a message', msg_subject)
-			settextvalue ('frmComposeamessage', 'txtMailBody', msg_body)
-			selectmenuitem ('frmComposeamessage', 'mnuFile;mnuSaveDraft')
-			selectmenuitem ('frmComposeamessage', 'mnuFile;mnuClose')
-		else:
-			log ('Compose a message dialog does not appear', 'error')
-			log ('Verify Change draft', 'fail')
-		selectrow ('Evolution-Mail', 'treeTabFolder', new_draft)
-		selectlastrow ('Evolution-Mail', 'treetblMails')
-		selectmenuitem ('Evolution-Mail', 'mnuFile;mnuOpenMessage')
-                setcontext('Compose a message', msg_subject)
-		if guiexist ('frmReadOnlyMail') == 1:
-                	verifytablecell ('frmReadOnlyMail', 'tblcheck', 1, 1, to_address)
-	                verifytablecell ('frmReadOnlyMail', 'tblcheck', 2, 1, cc_address)
-        	        verifytablecell ('frmReadOnlyMail', 'tblcheck', 3, 1, msg_subject)
-                	selectmenuitem ('frmReadOnlyMail','mnuFile;mnuClose')
-		else:
-			log ('Selected message not opened', 'error')
-			log ('Verify Change draft', 'fail')
-		log ('Verify Change draft', 'pass')
-	except msg, error:
-		log (str (msg), 'error')
-		log ('Verify Change draft', 'fail')
-
-#Getting the data
-file = open('change_draft.dat', 'r')
-argmts = file.readlines()
-index = int (argmts[1].strip( ))
-account = argmts[2].strip( )
-new_draft = argmts[3].strip( )
-to_address = argmts[4].strip( )
-cc_address = argmts[5].strip( )
-msg_subject = argmts[6].strip( )
-msg_body = argmts[7].strip( )
-
-
-#Calling the functions
-log ('Change and Verify Change Draft Folder', 'teststart')
-log ('Change Draft Folder', 'teststart')
-change_draft (new_draft, index, account)
-log ('Change Draft Folder', 'testend')
-log ('Verify Change Draft Folder', 'tesstart')
-veriry_draft (new_draft, to_address, cc_address, msg_subject, msg_body)
-log ('Verify Change Draft Folder', 'testend')
-log ('Change and Verify Change Draft Folder', 'testend')
diff --git a/evolution/compose-mail-w-attachment.dat b/evolution/compose-mail-w-attachment.dat
deleted file mode 100644
index ccea0d1..0000000
--- a/evolution/compose-mail-w-attachment.dat
+++ /dev/null
@@ -1,5 +0,0 @@
-nags@dell.net
-nags@dell.net
-this is subject
-this is body
-resume-Vishu.doc
\ No newline at end of file
diff --git a/evolution/compose-mail-w-attachment.py b/evolution/compose-mail-w-attachment.py
deleted file mode 100644
index d779549..0000000
--- a/evolution/compose-mail-w-attachment.py
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/python
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Bhargavi  <kbhargavi_83@yahoo.co.in>
-#     Premkumar <jpremkumar@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-
-#To compose a new mail message through File menu
-def compose_mail_w_attachment ( to, subject, body,filename ,cc=''):
-    try:
-        time.sleep (10)
-        selectmenuitem ('evolution', 'mnuView;mnuWindow;mnuMail')
-        time.sleep (10)
-        selectmenuitem ('evolution', 'mnuFile;mnuFileNew;mnuMailMessage')
-        time.sleep(3)
-        if guiexist ('Composeamessage') == 0:
-            log('Compose message window does not appear','error')
-            raise LdtpExecutionError (0)
-        else:
-            populate_mail_header (to, subject, body, cc)
-            selectmenuitem ('Composeamessage','mnuInsert;mnuAttachment')
-            time.sleep(3)
-            if guiexist ('dlgAttachfile') == 0:
-                log ('Select file dialog does not appear','error')
-                raise LdtpExecutionError (0)
-            else:
-                selectrow ('dlgAttachfile','tblFiles',filename)
-                click ('dlgAttachfile','btnAttach')
-                time.sleep(5)
-                if guiexist ('dlgAttachfile') == 1:
-                    log ('Select file dialog does not close after clicking attach button','error')
-                    raise LdtpExecutionError (0)
-                else:
-                    click ('Composeamessage', 'btnSend')
-                    time.sleep(3)
-                    if guiexist ('Composeamessage') == 1:
-                        log ('Failed during clicking the send button',
-                             'error')
-                        raise LdtpExecutionError (0)
-                    else:
-                        releasecontext()
-                        click ('evolution', 'btnSend/Receive')
-                        log ('Composeamessage', 'Pass')
-    except ldtp.error, msg:
-        print 'Compose new message failed ', str (msg)
-        log ('Compose new message failed', 'Fail' );
-
-#Reading Input from File
-file = open('compose-mail-w-attachment.dat','r')
-record = file.readlines();
-to = record[0].strip()
-cc = record[1].strip()
-subject = record[2].strip()
-body = record[3].strip()
-filename = record[4].strip()
-
-log ('Compose new message with attachment','Start')
-time.sleep(3)
-compose_mail_w_attachment (to,subject,body,filename,cc)
-time.sleep(3)
-log ('Compose new message with attachment','end')
-log ('Compose new message with attachment - verification','end')
-time.sleep(3)
-verifymailwithimage ('Sent Items',-9,'attachmentmail_refimg.png')
-time.sleep(3)
-log ('Compose new message with attachment - verification','end')
diff --git a/evolution/compose-mail.dat b/evolution/compose-mail.dat
deleted file mode 100644
index 00e8342..0000000
--- a/evolution/compose-mail.dat
+++ /dev/null
@@ -1,4 +0,0 @@
-nags@dell.net
-nags@dell.net
-this is subject
-this is body
\ No newline at end of file
diff --git a/evolution/compose-mail.py b/evolution/compose-mail.py
deleted file mode 100644
index 41bf33e..0000000
--- a/evolution/compose-mail.py
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/python
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Bhargavi   <kbhargavi_83@yahoo.co.in>
-#     Premkumarr <jpremkumar@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-
-
-#To compose a new mail message through File menu
-def compose_mail ( to, subject, body, cc=''):
-    try:
-        selectmenuitem ('evolution', 'mnuView;mnuWindow;mnuMail')
-        time.sleep(3)
-        selectmenuitem ('evolution', 'mnuFile;mnuFileNew;mnuMailMessage')
-        time.sleep(3)
-        if guiexist ('Composeamessage') == 0:
-            log('Compose message window does not appear','error')
-            raise LdtpExecutionError (0)
-        else:
-            populate_mail_header (to, subject, body, cc)
-            click ('Composeamessage', 'btnSend')
-            time.sleep(15)
-            if guiexist ('Composeamessage') == 1:
-                log ('Failed during clicking the send button','error')
-                raise LdtpExecutionError (0)
-            else:
-                releasecontext();
-                click ('evolution', 'btnSend/Receive')
-                log ('Composeamessage', 'Pass')
-    except ldtp.error, msg:
-        print 'Compose new message failed ', str (msg)
-        log ('Compose new message failed', 'Fail' );
-
-#Reading Input from File
-file = open('compose-mail.dat','r')
-record = file.readlines();
-to = record[0].strip()
-cc = record[1].strip()
-subject = record[2].strip()
-body = record[3].strip()
-
-log ('Compose new message','teststart')
-time.sleep(3)
-compose_mail (to,subject,body,cc)
-time.sleep(3)
-log ('Compose new message','testend')
-log ('Compose new message Verification','teststart')
-time.sleep(3)
-verifymailwithimage ('Sent Items',-1,'composemail_refimage.png')
-time.sleep(3)
-log ('Compose new message Verification','testend')
diff --git a/evolution/composemail_refimg.png b/evolution/composemail_refimg.png
deleted file mode 100644
index 9c6f72b..0000000
--- a/evolution/composemail_refimg.png
+++ /dev/null
diff --git a/evolution/copy_mails.dat b/evolution/copy_mails.dat
deleted file mode 100644
index 69e5dd0..0000000
--- a/evolution/copy_mails.dat
+++ /dev/null
@@ -1,5 +0,0 @@
-junk
-Mailbox
-test
-2
-3
diff --git a/evolution/copy_mails.py b/evolution/copy_mails.py
deleted file mode 100644
index aeda1ff..0000000
--- a/evolution/copy_mails.py
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Khasim Shaheed <sshaik@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-
-#Copy And Verify Copy of Mails
-import time
-
-#Copy mails
-def copy (source, destination, start, end):
-	try:
-		for i in range(start, end+1):
-			selectrowindex ('Evolution-Mail', 'treetblMails', i)
-			click ('Evolution-Mail', 'btnCopy')
-			selectrow ('dlgSelectFolder', 'treetblMails', destination)
-			click ('dlgSelectFolder', 'btnCopy')
-		log ('CopyMails', 'pass')
-	except:
-		log ('CopyMails', 'fail')
-
-#Verifying copy of mails
-def verify_copy (source, destination, no_mails, prev_scount, prev_dcount):
-	try:
-		click ('Evolution-Mail', 'tbtnMail')
-		time.sleep (2)
-		selectrow ('Evolution-Mail', 'treeTabFolder', destination)
-		new_dcount = getrowcount ('Evolution-Mail', 'treetblMails')
-                selectrow ('Evolution-Mail', 'treeTabFolder', source)
-		new_scount = getrowcount ('Evolution-Mail', 'treetblMails')
-		if (new_scount == prev_scount and new_dcount == (prev_dcount+no_mails)):
-			log ('Verify-Copy-Mails', 'pass')
-	        else:
-			log ('Verify-Copy-Mails', 'fail')
-        except:
-		log ('Verify-Copy-Mails', 'fail')
-
-#Getting the data from a file		
-file = open('copy_mails.dat', 'r')
-argmts = file.readlines()
-source = argmts[1].strip( )
-destination = argmts[2].strip( )
-start = int (argmts[3].strip( ))
-end = int (argmts[4].strip( ))
-
-#Calling the functions and getting the initial
-#message count of source and destination folders
-log('CopyAndVerifyCopyofMails', 'teststart')
-log('CopyMails' ,'teststart')
-click ('Evolution-Mail', 'tbtnMail')
-time.sleep (2)
-selectrow ('Evolution-Mail', 'treeTabFolder', destination)
-time.sleep (1)
-prev_dcount = getrowcount ('Evolution-Mail', 'treetblMails')
-selectrow ('Evolution-Mail', 'treeTabFolder', source)
-time.sleep (1)
-prev_scount = getrowcount ('Evolution-Mail', 'treetblMails')
-copy (source, destination, start, end)
-log('CopyMails' ,'testend')
-log('VerificationofCopyMails', 'teststart')
-no_mails = end-start+1
-verify_copy (source, destination, no_mails, prev_scount, prev_dcount)
-log('VerificationofCopyMails' ,'testend')
-log('CopyMailsandVerificationofCopyMails','testend')
diff --git a/evolution/copy_mails_new_folder.dat b/evolution/copy_mails_new_folder.dat
deleted file mode 100644
index f8ee78d..0000000
--- a/evolution/copy_mails_new_folder.dat
+++ /dev/null
@@ -1,6 +0,0 @@
-junk
-Mailbox
-dump
-ldtp@scooby.net
-0
-1
diff --git a/evolution/copy_mails_new_folder.py b/evolution/copy_mails_new_folder.py
deleted file mode 100644
index 637edda..0000000
--- a/evolution/copy_mails_new_folder.py
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Khasim Shaheed <sshaik@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-
-#Copy And Verify Copy of Mails
-import time
-
-#Copy mails
-def copy (source, destination, account_name, start, end):
-	try:
-		selectrowindex ('Evolution-Mail', 'treetblMails', start)
-		click ('Evolution-Mail', 'btnCopy')
-		click ('dlgSelectFolder', 'btnNew')
-		settextvalue ('dlgCreateNewFolder', 'txtFoldername', destination)
-		selectrow ('dlgCreateNewFolder', 'treetblMailFolderTree', account_name)
-		click ('dlgCreateNewFolder', 'btnCreate')
-		selectrow ('dlgSelectFolder', 'treetblMails', destination)
-		click ('dlgSelectFolder', 'btnCopy')
-		for i in range(start+1, end+1):
-			selectrowindex ('Evolution-Mail', 'treetblMails', i)
-			click ('Evolution-Mail', 'btnCopy')
-			selectrow ('dlgSelectFolder', 'treetblMails', destination)
-			click ('dlgSelectFolder', 'btnCopy')
-		log ('CopyMails', 'pass')
-	except:
-		log ('CopyMails', 'fail')
-
-#Verifying copy of mails
-def verify_copy (source, destination, no_mails, prev_scount):
-	try:
-		click ('Evolution-Mail', 'tbtnMail')
-		time.sleep (2)
-		selectrow ('Evolution-Mail', 'treeTabFolder', destination)
-		new_dcount = getrowcount ('Evolution-Mail', 'treetblMails')
-                selectrow ('Evolution-Mail', 'treeTabFolder', source)
-		new_scount = getrowcount ('Evolution-Mail', 'treetblMails')
-		if (new_scount == prev_scount and new_dcount == no_mails):
-			log ('Verify-Copy-Mails', 'pass')
-	        else:
-			log ('Verify-Copy-Mails', 'fail')
-        except:
-		log ('Verify-Copy-Mails', 'fail')
-
-#Getting the data from a file		
-file = open('copy_mails_new_folder.dat', 'r')
-argmts = file.readlines()
-source = argmts[1].strip( )
-destination = argmts[2].strip( )
-account_name = argmts[3].strip( )
-start = int (argmts[4].strip( ))
-end = int (argmts[5].strip( ))
-
-#Calling the functions and getting the initial
-#message count of source and destination folders
-log('CopyAndVerifyCopyofMails', 'teststart')
-log('CopyMails', 'teststart')
-click ('Evolution-Mail', 'tbtnMail')
-time.sleep (2)
-selectrow ('Evolution-Mail', 'treeTabFolder', source)
-time.sleep (1)
-prev_scount = getrowcount ('Evolution-Mail', 'treetblMails')
-copy (source, destination, account_name, start, end)
-log('CopyMails', 'testend')
-log('VerificationofCopyMails', 'teststart')
-no_mails = end-start+1
-verify_copy (source, destination, no_mails, prev_scount)
-log('VerificationofCopyMails', 'testend')
-log('CopyMailsandVerificationofCopyMails', 'testend')
diff --git a/evolution/copymail.dat b/evolution/copymail.dat
deleted file mode 100644
index 83b433d..0000000
--- a/evolution/copymail.dat
+++ /dev/null
@@ -1,3 +0,0 @@
-Inbox
-bugs
-$
\ No newline at end of file
diff --git a/evolution/copymail.py b/evolution/copymail.py
deleted file mode 100644
index e185a80..0000000
--- a/evolution/copymail.py
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/python
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Nagashree <mnagashree@novell.com>
-#     Premkumar <jpremkumar@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-
-#Copying an existing Mail
-
-# Section to select and copy mail
-def copy_mail (from_fldr,to_fldr, mail_index):
-	try:
-		time.sleep (10)
-		selectrowpartialmatch ('evolution', 'ttblMailFolderTree',
-				       to_fldr)
-		row_before = getrowcount('evolution', 'ttblMessageList')
-		time.sleep (2)
-		selectrowpartialmatch ('evolution', 'ttblMailFolderTree',
-				       from_fldr)
-		rowcount = getrowcount('evolution', 'ttblMessageList') 
-		if rowcount > 0:
-			if mail_index == -1:
-				mail_index = getrowcount ('evolution','ttblMessageList') -1
-			selectrowindex ('evolution', 'ttblMessageList', mail_index)
-			selectmenuitem ('evolution', 'mnuMessage;mnuCopyToFolder')
-			time.sleep (2)
-			selectrowpartialmatch ('dlgSelectfolder','ttblMailFolderTree', to_fldr )
-			click ('dlgSelectfolder', 'btnCopy')
-			time.sleep (2)
-			if guiexist('dlgSelectfolder') == 0:
-				log ('Select folder dialog not closed', 'error')
-				raise LdtpExecutionError(0)
-			else:
-				selectrowpartialmatch ('evolution', 'ttblMailFolderTree', to_fldr)
-				time.sleep (5)
-				row_after = getrowcount('evolution', 'ttblMessageList')
-				selectmenuitem ('evolution', 'mnuFile;mnuClose')
-				if row_after > row_before:
-					log ('Copying a mail passed successfully','pass') 
-				else :
-					log ('Copying a mail failed', 'fail')
-		else:
-			log ('From folder empty!', 'Warning')
-			log ('Did not move any mails to other folder', 'Pass')
-	except ldtp.error,msg:
-		print 'Copying mail between folders failed',str(msg)
-		log ('Copying mail failed','fail')
-			
-#Read input from file
-file = open ('copymail.dat', 'r')
-argmts = file.readlines ()
-from_fldr = argmts[0].strip ()
-to_fldr = argmts[1].strip ()
-mail_index = argmts[2].strip ()
-
-if mail_index == '$':
-	mail_index = -1;
-
-# Call the function
-log ('copyingmail', 'teststart')	
-copy_mail (from_fldr, to_fldr, mail_index)
-log ('copyingmail', 'testend')
-
-                                                                           
diff --git a/evolution/create-appointment.dat b/evolution/create-appointment.dat
deleted file mode 100644
index 64505eb..0000000
--- a/evolution/create-appointment.dat
+++ /dev/null
@@ -1,10 +0,0 @@
-this is sample summary1
-this is sample location1
-this is sample description1
-$
-$
-$
-$
-$
-$
-$
\ No newline at end of file
diff --git a/evolution/create-appointment.py b/evolution/create-appointment.py
deleted file mode 100644
index 034a8e9..0000000
--- a/evolution/create-appointment.py
+++ /dev/null
@@ -1,101 +0,0 @@
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Prem <jpremkumar@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-#To create an Appointment
-
-#Reading inputs from file
-file = open ('create-appointment.dat','r')
-data = file.readlines ()
-summary = data[0].strip ()
-location = data[1].strip ()
-description = data[2].strip ()
-classification = data[3].strip ()
-categories = data[4].strip ()
-moncount = data[5].strip ()
-on = data[6].strip ()
-day = data[7].strip ()
-occurences = data[8].strip ()
-exception = data[9].strip ()
-
-#TODO: INCLUDE actual date values after fixing the problem in insert_appointment
-date0 = 0
-time0 = 0
-date1 = 0
-time1 = 0
-
-#setting up default values
-if classification == '$':
-    classification = 'Public'
-if categories == '$':
-    categories = 'Business'
-if moncount == '$':
-    moncount = '3'
-if on == '$':
-    on = 'First'
-if day == '$':
-    day = 'Monday'
-if occurences == '$':
-    occurences = '5'
-if exception =='$' or exception > occurences:
-    if exception > occurences:
-        log ('Setting exception to default value since given value is inappropriate', 'warning')
-    exception = 2
-
-#creation fo appointment
-log ('Appointment Creation', 'teststart')
-
-try:
-    windowname = 'dlgAppointment-Nosummary'
-    ptlistname = 'ptlAppointment-Nosummary0'
-    selectmenuitem ('evolution', 'mnuView;mnuWindow;mnuCalendars')
-    time.sleep (2)
-    selectmenuitem ('evolution', 'mnuFile;mnuFileNew;mnuAppointment')
-    time.sleep (2)
-    if guiexist (windowname) == 0:
-        log ('Failed to open new appointment window', 'cause')
-        raise LdtpExecutionError (0)
-    else:
-        log ('Insertion of Appointment values', 'teststart')
-        insert_appointment (windowname, ptlistname, summary, location, description, date0,
-                            time0, date1, time1, classification, categories)
-        log ('Insertion of Appointment values', 'testend')
-        time.sleep (2)
-        log ('Insertion of recurrence values', 'teststart')
-        insert_recurrence (windowname, ptlistname, moncount, on, day, occurences, exception)
-        log ('Insertion of recurrence values', 'testend')
-        time.sleep (2)
-        click (windowname , 'btnOK')
-        time.sleep (3)
-        log ('Ignore the following error message, Because of Guiexist usage', 'info')
-        if guiexist ('dlgAppointment-Nosummary') == 1:
-            log ('Failed to close appointment dialog' ,'cause')
-            raise LdtpExecutionError (0)
-        time.sleep (2)
-        releasecontext ()
-        log ('Appointment creation succeeded', 'pass')
-except error,msg:
-    releasecontext ()
-    print 'Creation of appointment failed' + str(msg)
-    log ('Creation of appointment failed', 'error')
-    
-log ('Appointment Creation', 'testend')
diff --git a/evolution/create-calendar.dat b/evolution/create-calendar.dat
deleted file mode 100644
index ab4951a..0000000
--- a/evolution/create-calendar.dat
+++ /dev/null
@@ -1,6 +0,0 @@
-Holidays
-webcal://ical.mac.com/ical/Indian32Holidays.ics
-1
-1
-$
-$
\ No newline at end of file
diff --git a/evolution/create-calendar.py b/evolution/create-calendar.py
deleted file mode 100644
index 02e51a9..0000000
--- a/evolution/create-calendar.py
+++ /dev/null
@@ -1,89 +0,0 @@
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Prem <jpremkumar@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-#To create a Calendar
-
-#Reading inputs from file
-file = open ('create-calendar.dat','r')
-data = file.readlines ()
-name = data[0].strip ()
-url = data[1].strip ()
-check1 = data[2].strip ()
-check2 = data[3].strip ()
-timecount = data[4].strip ()
-timeunit = data[5].strip ()
-
-#creation fo meeting
-log ('Calendar Creation', 'teststart')
-try:
-    windowname = 'dlgNewCalendar'
-    selectmenuitem ('evolution', 'mnuView;mnuWindow;mnuCalendars')
-    time.sleep (2)
-    selectmenuitem ('evolution', 'mnuFile;mnuFileNew;mnuCalendar')
-    time.sleep (2)
-    if guiexist (windowname) == 0:
-        log ('Failed to open new calendar window', 'cause')
-        raise LdtpExecutionError (0)
-    else:
-        if selectitem (windowname, 'cboOnThisComputer', 'On The Web') != 1:
-            log ('Unable to select \'on the web\' item', 'error')
-            raise LdtpExecutionError (0)
-        if setandverify (windowname, 'txt1', name) == 0:
-            log ('Unable to set calendar title', 'cause')
-            raise LdtpExecutionError (0)
-        else:
-            if setandverify (windowname, 'txt0', url) == 0:
-                log ('Unable to set url', 'cause')
-                raise LdtpExecutionError (0)
-            else:
-                if check1 == '1':
-                    if check (windowname, 'chkCopycalendarcontentslocallyforofflineoperation') != 1:
-                        log ('Unable to mark check box: Copy calendar contents ...', 'error')
-                if check2 == '1':
-                    if check (windowname, 'chkMarkasdefaultfolder') != 1:
-                        log ('Unable to mark check bos: Mark as default folder' ,'error')
-                if timecount != '$':
-                    if setvalue (windowname, 'sbtn0', timecount) != 1:
-                        log ('Unable to set time of refreshing', 'error')
-                if timeunit != '$':
-                    if selectitem (windowname, 'cbominutes', timeunit) != 1:
-                        log ('Unable to set combo box (refresh)', 'error')
-                click (windowname, 'btnOK')
-                time.sleep (2)
-                log ('Ignore the follwoing error message, Because of guiexist usage', 'info')
-                if guiexist (windowname) == 1:
-                    log ('Failed to close new calendar dialog', 'error')
-                    raise LdtpExecutionError (0)
-                else:
-                    time.sleep (5)
-                    #Fixme: Just a workaround for verifying the calendar
-                    #If there is any better way please replace the following code with that :)
-                    if seletecrowpartialmatch ('evolution', 'tbl0', 'Independance Day') == 0:
-                        log ('Configuratoin of web calendar failed', 'cause')
-                        raise LdtpExecutionError (0)
-                    log ('Calendar creation', 'Pass')
-except error,msg:
-    print 'Creation of Calendar failed' + str(msg)
-    log ('Creation of Calendar failed', 'error')
-    
-log ('Calendar Creation', 'testend')
diff --git a/evolution/create-meeting.dat b/evolution/create-meeting.dat
deleted file mode 100644
index df555b9..0000000
--- a/evolution/create-meeting.dat
+++ /dev/null
@@ -1,10 +0,0 @@
-this is sample summary
-this is sample location
-this is sample description
-$
-$
-$
-$
-$
-$
-$
\ No newline at end of file
diff --git a/evolution/create-meeting.py b/evolution/create-meeting.py
deleted file mode 100644
index d604076..0000000
--- a/evolution/create-meeting.py
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Sheetal <svnayak18@yahoo.com>
-#     Prem <jpremkumar@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-#To create a Meeting
-
-#Reading inputs from file
-file = open ('create-meeting.dat','r')
-data = file.readlines ()
-summary = data[0].strip ()
-location = data[1].strip ()
-description = data[2].strip ()
-classification = data[3].strip ()
-categories = data[4].strip ()
-moncount = data[5].strip ()
-on = data[6].strip ()
-day = data[7].strip ()
-occurences = data[8].strip ()
-exception = data[9].strip ()
-
-#TODO: INCLUDE actual date values after fixing the problem in insert_appointment
-date0 = 0
-time0 = 0
-date1 = 0
-time1 = 0
-
-#setting up default values
-if classification == '$':
-    classification = 'Public'
-if categories == '$':
-    categories = 'Business'
-if moncount == '$':
-    moncount = '3'
-if on == '$':
-    on = 'First'
-if day == '$':
-    day = 'Monday'
-if occurences == '$':
-    occurences = '5'
-if exception =='$' or exception > occurences:
-    if exception > occurences:
-        log ('Setting exception to default value since given value is inappropriate', 'warning')
-    exception = 2
-
-#creation fo meeting
-log ('Meeting Creation', 'teststart')
-
-try:
-    windowname = 'dlgMeeting-Nosummary'
-    ptlistname = 'ptlMeeting-Nosummary0'
-    selectmenuitem ('evolution', 'mnuView;mnuWindow;mnuCalendars')
-    time.sleep (2)
-    selectmenuitem ('evolution', 'mnuFile;mnuFileNew;mnuMeeting')
-    time.sleep (2)
-    if guiexist (windowname) == 0:
-        log ('Failed to open new meeting window', 'cause')
-        raise LdtpExecutionError (0)
-    else:
-        log ('Insertion of Appointment values', 'teststart')
-        insert_appointment (windowname, ptlistname, summary, location, description, date0,
-                            time0, date1, time1, classification, categories)
-        log ('Insertion of Appointment values', 'testend')
-        time.sleep (2)
-        log ('Insertion of recurrence values', 'teststart')
-        insert_recurrence (windowname, ptlistname, moncount, on, day, occurences, exception)
-        log ('Insertion of recurrence values', 'testend')
-        time.sleep (2)
-
-        #TODO: include insert invitation 
-        
-        click ('dlgMeeting-Nosummary', 'btnOK')
-        time.sleep (3)
-        if guiexist ('dlgEvolutionQuery') == 0:
-            log ('Failed to open evolution query dialog' ,'cause')
-            raise LdtpExecutionError (0)
-        else:
-            click ('dlgEvolutionQuery', 'btnDon\'tSend')
-            time.sleep (3)
-            log ('Ignore the following error message, Because of Guiexist usage', 'info')
-            if guiexist ('dlgEvolutionQuery') == 1:
-                log ('Failed to close evolution query dialog' ,'cause')
-                raise LdtpExecutionError (0)
-            time.sleep (2)
-            log ('Ignore the following error message, Because of Guiexist usage', 'info')
-            if guiexist ('dlgMeeting-Nosummary') == 1:
-                log ('Failed to close meeting dialog' ,'cause')
-                raise LdtpExecutionError (0)
-            releasecontext ()
-            log ('Creation of meeting succeeded', 'Pass')
-except error,msg:
-    releasecontext ()
-    print 'Creation of meeting failed' + str(msg)
-    log ('Creation of meeting failed', 'error')
-    
-log ('Meeting Creation', 'testend')
diff --git a/evolution/deletemail.dat b/evolution/deletemail.dat
deleted file mode 100644
index cc70211..0000000
--- a/evolution/deletemail.dat
+++ /dev/null
@@ -1,2 +0,0 @@
-Inbox
-$
\ No newline at end of file
diff --git a/evolution/deletemail.py b/evolution/deletemail.py
deleted file mode 100644
index 8377276..0000000
--- a/evolution/deletemail.py
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/python
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Bhargavi  <kbhargavi_83@yahoo.co.in>
-#     Premkumar <jpremkumar@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-
-#Moving an existing Mail
-
-# Section to select and move mail
-def delete_mail (source_fldr, mail_index):
-	try:
-		time.sleep (10)
-		selectrowpartialmatch ('evolution', 'ttblMailFolderTree',
-				       source_fldr)
-		rowcount = getrowcount('evolution', 'ttblMessageList') 
-		if rowcount > 0:
-			if mail_index == -1:
-				mail_index = rowcount - 1
-			selectrowindex ('evolution', 'ttblMessageList', mail_index)
-			selectmenuitem ('evolution', 'mnuEdit;mnuDeleteMessage')
-			time.sleep (3)
-			selectrowpartialmatch ('evolution', 'ttblMailFolderTree',source_fldr)
-			time.sleep (5)
-			row_after = getrowcount('evolution','ttblMessageList')
-			#selectmenuitem ('evolution', 'mnuFile;mnuClose')
-			if row_after < rowcount:
-				log ('Deleting a mail passed successfully', 'pass') 
-			else:
-				log ('Deleting a mail failed', 'fail')
-		else:
-			log ('From folder empty!', 'Warning')
-			log ('Did not Delete any mail from source folder', 'Pass')
-	except ldtp.error,msg:
-		print 'Deleting mail between folders failed', str(msg)
-		log ('Moving mail failed', 'fail')
-			
-#Read input from file
-file = open ('deletemail.dat', 'r')
-argmts = file.readlines()
-source_fldr = argmts[0].strip ()
-mail_index = argmts[1].strip ()
-
-if mail_index == '$':
-	mail_index = -1
-	
-# Call the function
-log ('deletemail', 'teststart')	
-delete_mail (source_fldr, mail_index)
-log ('deletemail', 'testend')
-log ('Deleting mail succeeded', 'pass') 
-                                                                           
diff --git a/evolution/evolution-2.2.map b/evolution/evolution-2.2.map
deleted file mode 100644
index a9ed3af..0000000
--- a/evolution/evolution-2.2.map
+++ /dev/null
@@ -1,397 +0,0 @@
-[Evolution-Mail]
-Evolution-Mail={class=frame, app_name=evolution-2.2}
-mnuFile={class=menu, label=File}
-mnuNew={class=menu, label=New}
-mnuMailMessage={class=menu_item, label=Mail Message}
-mnuMailFolder={class=menu_item, label=Mail Folder}
-mnuAllDayAppointment={class=menu_item, label=All Day Appointment}
-mnuAppointment={class=menu_item, label=Appointment}
-mnuAssignedTask={class=menu_item, label=Assigned Task}
-mnuContact={class=menu_item, label=Contact}
-mnuContactList={class=menu_item, label=Contact List}
-mnuMeeting={class=menu_item, label=Meeting}
-mnuTask={class=menu_item, label=Task}
-mnuAddressBook={class=menu_item, label=Address Book}
-mnuCalendar={class=menu_item, label=Calendar}
-mnuTasklist={class=menu_item, label=Task list}
-mnuNewWindow={class=menu_item, label=New Window}
-mnuOpenMessage={class=menu_item, label=Open Message}
-mnuSaveAs={class=menu_item, label=Save As...}
-mnuImport={class=menu_item, label=Import...}
-mnuPrintPreview={class=menu_item, label=Print Preview}
-mnuPrint={class=menu_item, label=Print...}
-mnuFolder={class=menu, label=Folder}
-mnuProperties={class=menu_item, label=Properties}
-mnuWorkOffline={class=menu_item, label=Work Offline}
-mnuClose={class=menu_item, label=Close}
-mnuExit={class=menu_item, label=Exit}
-mnuEdit={class=menu, label=Edit}
-mnuSelectAll={class=menu_item, label=Select All}
-mnuSelectThread={class=menu_item, label=Select Thread}
-mnuInvertSelection={class=menu_item, label=Invert Selection}
-mnuCut={class=menu_item, label=Cut}
-mnuCopy={class=menu_item, label=Copy}
-mnuPaste={class=menu_item, label=Paste}
-mnuSearchinMessage={class=menu_item, label=Search in Message...}
-mnuDelete={class=menu_item, label=Delete}
-mnuUndelete={class=menu_item, label=Undelete}
-mnuMarkasRead={class=menu_item, label=Mark as Read}
-mnuMarkasUnread={class=menu_item, label=Mark as Unread}
-mnuMarkasImportant={class=menu_item, label=Mark as Important}
-mnuMarkasUnimportant={class=menu_item, label=Mark as Unimportant}
-mnuMarkasJunk={class=menu_item, label=Mark as Junk}
-mnuMarkasNotJunk={class=menu_item, label=Mark as Not Junk}
-mnuMarkAllasRead={class=menu_item, label=Mark All as Read}
-mnuPreferences={class=menu_item, label=Preferences}
-mnuView={class=menu, label=View}
-mnuWindow={class=menu, label=Window}
-mnuMail={class=menu_item, label=Mail}
-mnuContacts={class=menu_item, label=Contacts}
-mnuCalendars={class=menu_item, label=Calendars}
-mnuTasks={class=menu_item, label=Tasks}
-mnuWindowButtons={class=menu, label=Window Buttons}
-mnuIconsandtext={class=radio_menu_item, label=Icons and text}
-mnuIconsonly={class=radio_menu_item, label=Icons only}
-mnuTextonly={class=radio_menu_item, label=Text only}
-mnuToolbarstyle={class=radio_menu_item, label=Toolbar style}
-mnuHidebuttons={class=check_menu_item, label=Hide buttons}
-mnuToolbar={class=check_menu_item, label=Toolbar}
-mnuPreviewPane={class=check_menu_item, label=Preview Pane}
-mnuThreadedMessageList={class=check_menu_item, label=Threaded Message List}
-mnuHideDeletedMessages={class=check_menu_item, label=Hide Deleted Messages}
-mnuGoTo={class=menu, label=Go To}
-mnuNextMessage={class=menu_item, label=Next Message}
-mnuNextUnreadMessage={class=menu_item, label=Next Unread Message}
-mnuNextImportantMessage={class=menu_item, label=Next Important Message}
-mnuNextThread={class=menu_item, label=Next Thread}
-mnuPreviousMessage={class=menu_item, label=Previous Message}
-mnuPreviousUnreadMessage={class=menu_item, label=Previous Unread Message}
-mnuPreviousImportantMessage={class=menu_item, label=Previous Important Message}
-mnuTextSize={class=menu, label=Text Size}
-mnuSmaller={class=menu_item, label=Smaller}
-mnuLarger={class=menu_item, label=Larger}
-mnuOriginalSize={class=menu_item, label=Original Size}
-mnuMessageDisplay={class=menu, label=Message Display}
-mnuLoadImages={class=menu_item, label=Load Images}
-mnuCaretMode={class=check_menu_item, label=Caret Mode}
-mnuNormalDisplay={class=radio_menu_item, label=Normal Display}
-mnuShowFullHeaders={class=radio_menu_item, label=Show Full Headers}
-mnuShowEmailSource={class=radio_menu_item, label=Show Email Source}
-mnuHideSelectedMessages={class=menu_item, label=Hide Selected Messages}
-mnuHideReadMessages={class=menu_item, label=Hide Read Messages}
-mnuShowHiddenMessages={class=menu_item, label=Show Hidden Messages}
-mnuCharacterEncoding={class=menu, label=Character Encoding}
-mnuBaltic={class=radio_menu_item, label=Baltic (ISO-8859-13)}
-mnuBaltic={class=radio_menu_item, label=Baltic (ISO-8859-4)}
-mnuCentralEuropean={class=radio_menu_item, label=Central European (ISO-8859-2)}
-mnuChinese,Traditional={class=radio_menu_item, label=Chinese, Traditional (Big5)}
-mnuChinese,Traditional={class=radio_menu_item, label=Chinese, Traditional (BIG5HKSCS)}
-mnuChinese,Traditional={class=radio_menu_item, label=Chinese, Traditional (EUC-TW)}
-mnuChinese,Simplified={class=radio_menu_item, label=Chinese, Simplified (GB18030)}
-mnuChinese,Simplified={class=radio_menu_item, label=Chinese, Simplified (GB2312)}
-mnuChinese,Simplified={class=radio_menu_item, label=Chinese, Simplified (HZ)}
-mnuChinese,Simplified={class=radio_menu_item, label=Chinese, Simplified (ISO-2022-CN)}
-mnuCyrillic={class=radio_menu_item, label=Cyrillic (KOI8-R)}
-mnuCyrillic={class=radio_menu_item, label=Cyrillic (Windows-1251)}
-mnuCyrillic,Ukrainian={class=radio_menu_item, label=Cyrillic, Ukrainian (KOI8-U)}
-mnuCyrillic={class=radio_menu_item, label=Cyrillic (ISO-8859-5)}
-mnuGreek={class=radio_menu_item, label=Greek (ISO-8859-7)}
-mnuHebrew,Visual={class=radio_menu_item, label=Hebrew, Visual (ISO-8859-8)}
-mnuJapanese={class=radio_menu_item, label=Japanese (ISO-2022-JP)}
-mnuJapanese={class=radio_menu_item, label=Japanese (EUC-JP)}
-mnuJapanese={class=radio_menu_item, label=Japanese (Shift_JIS)}
-mnuKorean={class=radio_menu_item, label=Korean (EUC-KR)}
-mnuTurkish={class=radio_menu_item, label=Turkish (ISO-8859-9)}
-mnuUnicode={class=radio_menu_item, label=Unicode (UTF-8)}
-mnuUnicode={class=radio_menu_item, label=Unicode (UTF-7)}
-mnuWesternEuropean={class=radio_menu_item, label=Western European (ISO-8859-1)}
-mnuWesternEuropean,New={class=radio_menu_item, label=Western European, New (ISO-8859-15)}
-mnuDefault={class=radio_menu_item, label=Default}
-mnuActions={class=menu, label=Actions}
-mnuSend/Receive={class=menu_item, label=Send / Receive}
-mnuForgetPasswords={class=menu_item, label=Forget Passwords}
-mnuComposeNewMessage={class=menu_item, label=Compose New Message}
-mnuPostNewMessage={class=menu_item, label=Post New Message}
-mnuCancel={class=menu_item, label=Cancel}
-mnuFollowUp={class=menu_item, label=Follow Up...}
-mnuReplytoSender={class=menu_item, label=Reply to Sender}
-mnuReplytoList={class=menu_item, label=Reply to List}
-mnuReplytoAll={class=menu_item, label=Reply to All}
-mnuForward={class=menu_item, label=Forward}
-mnuForwardAs...={class=menu, label=Forward As...}
-mnuAttached={class=menu_item, label=Attached}
-mnuInline={class=menu_item, label=Inline}
-mnuQuoted={class=menu_item, label=Quoted}
-mnuRedirect={class=menu_item, label=Redirect}
-mnuPostaReply={class=menu_item, label=Post a Reply}
-mnuEditasNewMessage={class=menu_item, label=Edit as New Message...}
-mnuMovetoFolder={class=menu_item, label=Move to Folder}
-mnuCopytoFolder={class=menu_item, label=Copy to Folder}
-mnuAddSendertoAddressBook={class=menu_item, label=Add Sender to Address Book}
-mnuApplyFilters={class=menu_item, label=Apply Filters}
-mnuFilterJunk={class=menu_item, label=Filter Junk}
-mnuSaveAttachments={class=menu_item, label=Save Attachments ...}
-mnuExpunge={class=menu_item, label=Expunge}
-mnuEmptyTrash={class=menu_item, label=Empty Trash}
-mnuMailingList={class=menu, label=Mailing List}
-mnuGetlistusageinformation={class=menu_item, label=Get list usage information}
-mnuSubscribetolist={class=menu_item, label=Subscribe to list}
-mnuUn-subscribetolist={class=menu_item, label=Un-subscribe to list}
-mnuPostmessagetolist={class=menu_item, label=Post message to list}
-mnuContactlistowner={class=menu_item, label=Contact list owner}
-mnuGetlistarchive={class=menu_item, label=Get list archive}
-mnuTools={class=menu, label=Tools}
-mnuFilters={class=menu_item, label=Filters...}
-mnuCreateFilterFromMessage={class=menu, label=Create Filter From Message}
-mnuFilteronSubject={class=menu_item, label=Filter on Subject...}
-mnuFilteronSender={class=menu_item, label=Filter on Sender...}
-mnuFilteronRecipients={class=menu_item, label=Filter on Recipients...}
-mnuFilteronMailingList={class=menu_item, label=Filter on Mailing List...}
-mnuvFolderEditor={class=menu_item, label=vFolder Editor...}
-mnuCreatevFolderFromMessage={class=menu, label=Create vFolder From Message}
-mnuvFolderonSubject={class=menu_item, label=vFolder on Subject...}
-mnuvFolderonSender={class=menu_item, label=vFolder on Sender...}
-mnuvFolderonRecipients={class=menu_item, label=vFolder on Recipients...}
-mnuvFolderonMailingList={class=menu_item, label=vFolder on Mailing List...}
-mnuSubscribetoFolders={class=menu_item, label=Subscribe to Folders...}
-mnuPilotSettings={class=menu_item, label=Pilot Settings...}
-mnuManagePlugins={class=menu_item, label=Manage Plugins...}
-mnuSearch={class=menu, label=Search}
-mnuFindNow={class=menu_item, label=Find Now}
-mnuClear={class=menu_item, label=Clear}
-mnuAdvanced={class=menu_item, label=Advanced...}
-mnuSaveSearch={class=menu_item, label=Save Search...}
-mnuEditSavedSearches={class=menu_item, label=Edit Saved Searches...}
-mnuCreatevFolderFromSearch={class=menu_item, label=Create vFolder From Search...}
-mnuHelp={class=menu, label=Help}
-mnuContents={class=menu_item, label=Contents}
-mnuQuickReference={class=menu_item, label=Quick Reference}
-mnuSubmitBugReport={class=menu_item, label=Submit Bug Report}
-mnuAboutEvolution={class=menu_item, label=About Evolution...}
-btnNew={class=push_button, label=New}
-btnSend/Receive={class=push_button, label=Send / Receive}
-btnReply={class=push_button, label=Reply}
-btnReplytoAll={class=push_button, label=Reply to All}
-btnForward={class=push_button, label=Forward}
-btnMove={class=push_button, label=Move}
-btnCopy={class=push_button, label=Copy}
-btnPrint={class=push_button, label=Print}
-btnDelete={class=push_button, label=Delete}
-btnJunk={class=push_button, label=Junk}
-btnNotJunk={class=push_button, label=Not Junk}
-btnCancel={class=push_button, label=Cancel}
-btnPrevious={class=push_button, label=Previous}
-btnNext={class=push_button, label=Next}
-tbtnMail={class=toggle_button, label=Mail}
-tbtnContacts={class=toggle_button, label=Contacts}
-tbtnCalendars={class=toggle_button, label=Calendars}
-tbtnTasks={class=toggle_button, label=Tasks}
-mnuSubjectorSendercontains={class=menu_item, label=Subject or Sender contains}
-mnuRecipientscontain={class=menu_item, label=Recipients contain}
-mnuMessagecontains={class=menu_item, label=Message contains}
-mnuSubjectcontains={class=menu_item, label=Subject contains}
-mnuSendercontains={class=menu_item, label=Sender contains}
-mnuBodycontains={class=menu_item, label=Body contains}
-mnuSubjectorSendercontains={class=menu_item, label=Subject or Sender contains}
-mnuAdvanced={class=menu_item, label=Advanced...}
-txtSearchTextEntry={class=text, label=Search Text Entry}
-btnFindNow={class=push_button, label=Find Now}
-btnClear={class=push_button, label=Clear}
-
-[Composeamessage]
-Composeamessage={class=frame, app_name=evolution-2.2, label=Compose a message}
-mnuFile={class=menu, label=File}
-mnuOpen={class=menu_item, label=Open...}
-mnuSend={class=menu_item, label=Send}
-mnuSave={class=menu_item, label=Save}
-mnuSaveAs={class=menu_item, label=Save As...}
-mnuSaveDraft={class=menu_item, label=Save Draft}
-mnuClose={class=menu_item, label=Close}
-mnuEdit={class=menu, label=Edit}
-mnuUndo={class=menu_item, label=Undo}
-mnuRedo={class=menu_item, label=Redo}
-mnuCut={class=menu_item, label=Cut}
-mnuCopy={class=menu_item, label=Copy}
-mnuPaste={class=menu_item, label=Paste}
-mnuPasteQuotation={class=menu_item, label=Paste Quotation}
-mnuSelectAll={class=menu_item, label=Select All}
-mnuFind={class=menu_item, label=Find...}
-mnuFindAgain={class=menu_item, label=Find Again}
-mnuReplace={class=menu_item, label=Replace...}
-mnuCharacterEncoding={class=menu, label=Character Encoding}
-mnuBaltic={class=radio_menu_item, label=Baltic (ISO-8859-13)}
-mnuBaltic={class=radio_menu_item, label=Baltic (ISO-8859-4)}
-mnuCentralEuropean={class=radio_menu_item, label=Central European (ISO-8859-2)}
-mnuChinese,Traditional={class=radio_menu_item, label=Chinese, Traditional (Big5)}
-mnuChinese,Traditional={class=radio_menu_item, label=Chinese, Traditional (BIG5HKSCS)}
-mnuChinese,Traditional={class=radio_menu_item, label=Chinese, Traditional (EUC-TW)}
-mnuChinese,Simplified={class=radio_menu_item, label=Chinese, Simplified (GB18030)}
-mnuChinese,Simplified={class=radio_menu_item, label=Chinese, Simplified (GB2312)}
-mnuChinese,Simplified={class=radio_menu_item, label=Chinese, Simplified (HZ)}
-mnuChinese,Simplified={class=radio_menu_item, label=Chinese, Simplified (ISO-2022-CN)}
-mnuCyrillic={class=radio_menu_item, label=Cyrillic (KOI8-R)}
-mnuCyrillic={class=radio_menu_item, label=Cyrillic (Windows-1251)}
-mnuCyrillic,Ukrainian={class=radio_menu_item, label=Cyrillic, Ukrainian (KOI8-U)}
-mnuCyrillic={class=radio_menu_item, label=Cyrillic (ISO-8859-5)}
-mnuGreek={class=radio_menu_item, label=Greek (ISO-8859-7)}
-mnuHebrew,Visual={class=radio_menu_item, label=Hebrew, Visual (ISO-8859-8)}
-mnuJapanese={class=radio_menu_item, label=Japanese (ISO-2022-JP)}
-mnuJapanese={class=radio_menu_item, label=Japanese (EUC-JP)}
-mnuJapanese={class=radio_menu_item, label=Japanese (Shift_JIS)}
-mnuKorean={class=radio_menu_item, label=Korean (EUC-KR)}
-mnuTurkish={class=radio_menu_item, label=Turkish (ISO-8859-9)}
-mnuUnicode={class=radio_menu_item, label=Unicode (UTF-8)}
-mnuUnicode={class=radio_menu_item, label=Unicode (UTF-7)}
-mnuWesternEuropean={class=radio_menu_item, label=Western European (ISO-8859-1)}
-mnuWesternEuropean,New={class=radio_menu_item, label=Western European, New (ISO-8859-15)}
-mnuSpellCheckDocument={class=menu_item, label=Spell Check Document...}
-mnuCurrentLanguages={class=menu, label=Current Languages}
-mnuEnglish={class=check_menu_item, label=English (American)}
-mnuEnglish={class=check_menu_item, label=English (British)}
-mnuEnglish={class=check_menu_item, label=English (Canadian)}
-mnuFormat={class=menu, label=Format}
-mnuHTML={class=check_menu_item, label=HTML}
-mnuStyle={class=menu, label=Style}
-mnuPlaintext={class=menu_item, label=Plain text}
-mnuBold={class=menu_item, label=Bold}
-mnuItalic={class=menu_item, label=Italic}
-mnuUnderline={class=menu_item, label=Underline}
-mnuStrikeout={class=menu_item, label=Strikeout}
-mnuFontSize={class=menu, label=Font Size}
-mnu-2={class=menu_item, label=-2}
-mnu-1={class=menu_item, label=-1}
-mnu+0={class=menu_item, label=+0}
-mnu+1={class=menu_item, label=+1}
-mnu+2={class=menu_item, label=+2}
-mnu+3={class=menu_item, label=+3}
-mnuText={class=menu_item, label=Text...}
-mnuHeading={class=menu, label=Heading}
-mnuNormal={class=menu_item, label=Normal}
-mnuHeader1={class=menu_item, label=Header 1}
-mnuHeader2={class=menu_item, label=Header 2}
-mnuHeader3={class=menu_item, label=Header 3}
-mnuHeader4={class=menu_item, label=Header 4}
-mnuHeader5={class=menu_item, label=Header 5}
-mnuHeader6={class=menu_item, label=Header 6}
-mnuBulletedList={class=menu_item, label=Bulleted List}
-mnuRomanNumeralList={class=menu_item, label=Roman Numeral List}
-mnuNumberedList={class=menu_item, label=Numbered List}
-mnuAlphabeticalList={class=menu_item, label=Alphabetical List}
-mnuAddress={class=menu_item, label=Address}
-mnuPreformat={class=menu_item, label=Preformat}
-mnuAlignment={class=menu, label=Alignment}
-mnuLeft={class=menu_item, label=Left}
-mnuCenter={class=menu_item, label=Center}
-mnuRight={class=menu_item, label=Right}
-mnuParagraph={class=menu_item, label=Paragraph...}
-mnuIncreaseIndent={class=menu_item, label=Increase Indent}
-mnuDecreaseIndent={class=menu_item, label=Decrease Indent}
-mnuWrapLines={class=menu_item, label=Wrap Lines}
-mnuPage={class=menu_item, label=Page...}
-mnuView={class=menu, label=View}
-mnuShowattachments={class=check_menu_item, label=Show attachments}
-mnuFromField={class=check_menu_item, label=From Field}
-mnuToField={class=check_menu_item, label=To Field}
-mnuPost-ToField={class=check_menu_item, label=Post-To Field}
-mnuReply-ToField={class=check_menu_item, label=Reply-To Field}
-mnuCcField={class=check_menu_item, label=Cc Field}
-mnuBccField={class=check_menu_item, label=Bcc Field}
-mnuInsert={class=menu, label=Insert}
-mnuAttachment={class=menu_item, label=Attachment...}
-mnuSendOptions={class=menu_item, label=Send Options}
-mnuImage={class=menu_item, label=Image...}
-mnuLink={class=menu_item, label=Link...}
-mnuRule={class=menu_item, label=Rule...}
-mnuTable={class=menu_item, label=Table...}
-mnuTextfile={class=menu_item, label=Text file...}
-mnuHTMLfile={class=menu_item, label=HTML file...}
-mnuSmiley={class=menu, label=Smiley}
-mnuSmile={class=menu_item, label=Smile}
-mnuWink={class=menu_item, label=Wink}
-mnuSurprised={class=menu_item, label=Surprised}
-mnuLaughing={class=menu_item, label=Laughing}
-mnuOhno!={class=menu_item, label=Oh no!}
-mnuFrown={class=menu_item, label=Frown}
-mnuIndifferent={class=menu_item, label=Indifferent}
-mnuUndecided={class=menu_item, label=Undecided}
-mnuLick={class=menu_item, label=Lick}
-mnuCrying={class=menu_item, label=Crying}
-mnuSick={class=menu_item, label=Sick}
-mnuSecurity={class=menu, label=Security}
-mnuPGPSign={class=check_menu_item, label=PGP Sign}
-mnuPGPEncrypt={class=check_menu_item, label=PGP Encrypt}
-mnuS/MIMESign={class=check_menu_item, label=S/MIME Sign}
-mnuS/MIMEEncrypt={class=check_menu_item, label=S/MIME Encrypt}
-btnSend={class=push_button, label=Send}
-btnAttach={class=push_button, label=Attach}
-btnUndo={class=push_button, label=Undo}
-btnRedo={class=push_button, label=Redo}
-btnCut={class=push_button, label=Cut}
-btnCopy={class=push_button, label=Copy}
-btnPaste={class=push_button, label=Paste}
-btnFind={class=push_button, label=Find}
-btnReplace={class=push_button, label=Replace}
-btnImage={class=push_button, label=Image}
-btnLink={class=push_button, label=Link}
-btnRule={class=push_button, label=Rule}
-btnTable={class=push_button, label=Table}
-txtSubject={class=text, label_by=Subject:}
-txtPostTo={class=text, label=Post To:}
-btnPostTo:={class=push_button, label=Post To:}
-txtBcc={class=text, label=Bcc:}
-btnBcc:={class=push_button, label=Bcc:}
-txtCc={class=text, label=Cc:}
-btnCc:={class=push_button, label=Cc:}
-txtTo={class=text, label=To:}
-btnTo:={class=push_button, label=To:}
-txtReply-To={class=text, label_by=Reply-To:}
-mnuNagappanA<anagappan@novell={class=menu_item, label=Nagappan A <anagappan@novell.com>}
-mnuNone={class=menu_item, label=None}
-mnuAutogenerated={class=menu_item, label=Autogenerated}
-mnu-2={class=menu_item, label=-2}
-mnu-1={class=menu_item, label=-1}
-mnu+0={class=menu_item, label=+0}
-mnu+1={class=menu_item, label=+1}
-mnu+2={class=menu_item, label=+2}
-mnu+3={class=menu_item, label=+3}
-mnu+4={class=menu_item, label=+4}
-mnuNormal={class=menu_item, label=Normal}
-mnuPreformat={class=menu_item, label=Preformat}
-mnuBulletedList={class=menu_item, label=Bulleted List}
-mnuNumberedList={class=menu_item, label=Numbered List}
-mnuRomanList={class=menu_item, label=Roman List}
-mnuAlphabeticalList={class=menu_item, label=Alphabetical List}
-mnuHeader1={class=menu_item, label=Header 1}
-mnuHeader2={class=menu_item, label=Header 2}
-mnuHeader3={class=menu_item, label=Header 3}
-mnuHeader4={class=menu_item, label=Header 4}
-mnuHeader5={class=menu_item, label=Header 5}
-mnuHeader6={class=menu_item, label=Header 6}
-mnuAddress={class=menu_item, label=Address}
-tbtnTypewriter={class=toggle_button, label=Typewriter}
-tbtnBold={class=toggle_button, label=Bold}
-tbtnItalic={class=toggle_button, label=Italic}
-tbtnUnderline={class=toggle_button, label=Underline}
-tbtnStrikeout={class=toggle_button, label=Strikeout}
-rdoLeftalign={class=radio_button, label=Left align}
-rdoCenter={class=radio_button, label=Center}
-rdoRightalign={class=radio_button, label=Right align}
-btnUnindent={class=push_button, label=Unindent}
-btnIndent={class=push_button, label=Indent}
-btncolorpreview={class=push_button, label=color preview}
-tbtnPopup={class=toggle_button, label=Popup}
-paneAttachmentBar={class=layered_pane, label=Attachment Bar}
-
-[dlgAttachfile(s)]
-dlgAttachfile(s)={class=dialog, label=Attach file(s), app_name=evolution-2.2}
-txtName={class=text, label_by=Name:}
-tbtnBrowseforotherfolders={class=toggle_button, label=Browse for other folders}
-tblShortcuts={class=table, label=Shortcuts}
-btnAdd={class=push_button, label=Add}
-btnRemove={class=push_button, label=Remove}
-tbtnHome={class=toggle_button, label=Home}
-btnCreateFolder={class=push_button, label=Create Folder}
-tblFiles={class=table, label=Files}
-chkSuggestautomaticdisplayofattachment={class=check_box, label=Suggest automatic display of attachment}
-btnOpen={class=push_button, label=Open}
-btnCancel={class=push_button, label=Cancel}
diff --git a/evolution/evolution.map b/evolution/evolution.map
deleted file mode 100644
index af2c9cc..0000000
--- a/evolution/evolution.map
+++ /dev/null
@@ -1,1107 +0,0 @@
-[evolution]
-evolution={class=frame, app_name=evolution}
-pnl0={class=panel, instance_index=0,parent=Evolution-Mail}
-pnl1={class=panel, instance_index=1,parent=Evolution-Mail}
-pnl2={class=panel, instance_index=2,parent=Evolution-Mail}
-mnuFile={class=menu, label=File}
-mnuFileNew={class=menu, label=New}
-mnuMailMessage={class=menu_item, label=Mail Message, parent=mnuFileNew}
-mnuMailFolder={class=menu_item, label=Mail Folder, parent=mnuFileNew}
-mnuAllDayAppointment={class=menu_item, label=All Day Appointment, parent=mnuFileNew}
-mnuAppointment={class=menu_item, label=Appointment, parent=mnuFileNew}
-mnuAssignedTask={class=menu_item, label=Assigned Task, parent=mnuFileNew}
-mnuContact={class=menu_item, label=Contact, parent=mnuFileNew}
-mnuContactList={class=menu_item, label=Contact List, parent=mnuFileNew}
-mnuMeeting={class=menu_item, label=Meeting, parent=mnuFileNew}
-mnuTask={class=menu_item, label=Task, parent=mnuFileNew}
-mnuAddressBook={class=menu_item, label=Address Book, parent=mnuFileNew}
-mnuCalendar={class=menu_item, label=Calendar, parent=mnuFileNew}
-mnuTasklist={class=menu_item, label=Task list, parent=mnuFileNew}
-mnuFileNewWindow={class=menu_item, label=New Window, parent=mnuFile}
-mnuSend/Receive={class=menu_item, label=Send / Receive, parent=mnuFile}
-mnuSaveMessage={class=menu_item, label=Save Message..., parent=mnuFile}
-mnuImport={class=menu_item, label=Import..., parent=mnuFile}
-mnuPrintPreview={class=menu_item, label=Print Preview, parent=mnuFile}
-mnuPrint={class=menu_item, label=Print..., parent=mnuFile}
-mnuEmptyTrash={class=menu_item, label=Empty Trash, parent=mnuFile}
-mnuForgetPasswords={class=menu_item, label=Forget Passwords, parent=mnuFile}
-mnuWorkOffline={class=menu_item, label=Work Offline, parent=mnuFile}
-mnuCloseWindow={class=menu_item, label=Close Window, parent=mnuFile}
-mnuQuit={class=menu_item, label=Quit, parent=mnuFile}
-mnuEdit={class=menu, label=Edit}
-mnuCopy={class=menu_item, label=Copy, parent=mnuEdit}
-mnuSelectAllText={class=menu_item, label=Select All Text, parent=mnuEdit}
-mnuDeleteMessage={class=menu_item, label=Delete Message, parent=mnuEdit}
-mnuUndeleteMessage={class=menu_item, label=Undelete Message, parent=mnuEdit}
-mnuFindinMessage={class=menu_item, label=Find in Message..., parent=mnuEdit}
-mnuSynchronizationOptions={class=menu_item, label=Synchronization Options..., parent=mnuEdit}
-mnuMessageFilters={class=menu_item, label=Message Filters, parent=mnuEdit}
-mnuSearchFolders={class=menu_item, label=Search Folders, parent=mnuEdit}
-mnuPreferences={class=menu_item, label=Preferences, parent=mnuEdit}
-mnuView={class=menu, label=View}
-mnuCurrentView={class=menu, label=Current View}
-mnuMessages={class=radio_menu_item, label=Messages, parent=mnuMessages}
-mnuAsSentFolder={class=radio_menu_item, label=As Sent Folder, parent=mnuAsSentFolder}
-mnuBySubject={class=radio_menu_item, label=By Subject, parent=mnuBySubject}
-mnuBySender={class=radio_menu_item, label=By Sender, parent=mnuBySender}
-mnuByStatus={class=radio_menu_item, label=By Status, parent=mnuByStatus}
-mnuByFollowUpFlag={class=radio_menu_item, label=By Follow Up Flag, parent=mnuByFollowUpFlag}
-mnuCustomView={class=radio_menu_item, label=Custom View, parent=mnuCustomView}
-mnuSaveCustomView={class=menu_item, label=Save Custom View..., parent=mnuSaveCustomView...}
-mnuDefineViews={class=menu_item, label=Define Views..., parent=mnuDefineViews...}
-mnuWindow={class=menu, label=Window}
-mnuMail={class=menu_item, label=Mail, parent=mnuWindow}
-mnuContacts={class=menu_item, label=Contacts, parent=mnuWindow}
-mnuCalendars={class=menu_item, label=Calendars, parent=mnuWindow}
-mnuTasks={class=menu_item, label=Tasks, parent=mnuWindow}
-mnuToolbar={class=check_menu_item, label=Toolbar, parent=mnuView}
-mnuMessagePreview={class=check_menu_item, label=Message Preview, parent=mnuView}
-mnuSwitcherAppearance={class=menu, label=Switcher Appearance}
-mnuIconsandtext={class=radio_menu_item, label=Icons and text, parent=mnuIconsandtext}
-mnuIconsonly={class=radio_menu_item, label=Icons only, parent=mnuIconsonly}
-mnuTextonly={class=radio_menu_item, label=Text only, parent=mnuTextonly}
-mnuToolbarstyle={class=radio_menu_item, label=Toolbar style, parent=mnuToolbarstyle}
-mnuHidebuttons={class=check_menu_item, label=Hide buttons, parent=mnuHidebuttons}
-mnuGroupByThreads={class=check_menu_item, label=Group By Threads, parent=mnuView}
-mnuHideDeletedMessages={class=check_menu_item, label=Hide Deleted Messages, parent=mnuView}
-mnuHideSelectedMessages={class=menu_item, label=Hide Selected Messages, parent=mnuView}
-mnuHideReadMessages={class=menu_item, label=Hide Read Messages, parent=mnuView}
-mnuShowHiddenMessages={class=menu_item, label=Show Hidden Messages, parent=mnuView}
-mnuLoadImages={class=menu_item, label=Load Images, parent=mnuView}
-mnuAllMessageHeaders={class=check_menu_item, label=All Message Headers, parent=mnuView}
-mnuCaretMode={class=check_menu_item, label=Caret Mode, parent=mnuView}
-mnuMessageSource={class=menu_item, label=Message Source, parent=mnuView}
-mnuZoomIn={class=menu_item, label=Zoom In, parent=mnuView}
-mnuZoomOut={class=menu_item, label=Zoom Out, parent=mnuView}
-mnuNormalSize={class=menu_item, label=Normal Size, parent=mnuView}
-mnuCharacterEncoding={class=menu, label=Character Encoding}
-mnuBaltic={class=radio_menu_item, label=Baltic (ISO-8859-13), parent=mnuBaltic}
-mnuBaltic={class=radio_menu_item, label=Baltic (ISO-8859-4), parent=mnuBaltic}
-mnuCentralEuropean={class=radio_menu_item, label=Central European (ISO-8859-2), parent=mnuCentralEuropean}
-mnuChinese,Traditional={class=radio_menu_item, label=Chinese, Traditional (Big5), parent=mnuChinese,Traditional}
-mnuChinese,Traditional={class=radio_menu_item, label=Chinese, Traditional (BIG5HKSCS), parent=mnuChinese,Traditional}
-mnuChinese,Traditional={class=radio_menu_item, label=Chinese, Traditional (EUC-TW), parent=mnuChinese,Traditional}
-mnuChinese,Simplified={class=radio_menu_item, label=Chinese, Simplified (GB18030), parent=mnuChinese,Simplified}
-mnuChinese,Simplified={class=radio_menu_item, label=Chinese, Simplified (GB2312), parent=mnuChinese,Simplified}
-mnuChinese,Simplified={class=radio_menu_item, label=Chinese, Simplified (HZ), parent=mnuChinese,Simplified}
-mnuChinese,Simplified={class=radio_menu_item, label=Chinese, Simplified (ISO-2022-CN), parent=mnuChinese,Simplified}
-mnuCyrillic={class=radio_menu_item, label=Cyrillic (KOI8-R), parent=mnuCyrillic}
-mnuCyrillic={class=radio_menu_item, label=Cyrillic (Windows-1251), parent=mnuCyrillic}
-mnuCyrillic,Ukrainian={class=radio_menu_item, label=Cyrillic, Ukrainian (KOI8-U), parent=mnuCyrillic,Ukrainian}
-mnuCyrillic={class=radio_menu_item, label=Cyrillic (ISO-8859-5), parent=mnuCyrillic}
-mnuGreek={class=radio_menu_item, label=Greek (ISO-8859-7), parent=mnuGreek}
-mnuHebrew,Visual={class=radio_menu_item, label=Hebrew, Visual (ISO-8859-8), parent=mnuHebrew,Visual}
-mnuJapanese={class=radio_menu_item, label=Japanese (ISO-2022-JP), parent=mnuJapanese}
-mnuJapanese={class=radio_menu_item, label=Japanese (EUC-JP), parent=mnuJapanese}
-mnuJapanese={class=radio_menu_item, label=Japanese (Shift_JIS), parent=mnuJapanese}
-mnuKorean={class=radio_menu_item, label=Korean (EUC-KR), parent=mnuKorean}
-mnuTurkish={class=radio_menu_item, label=Turkish (ISO-8859-9), parent=mnuTurkish}
-mnuUnicode={class=radio_menu_item, label=Unicode (UTF-8), parent=mnuUnicode}
-mnuUnicode={class=radio_menu_item, label=Unicode (UTF-7), parent=mnuUnicode}
-mnuWesternEuropean={class=radio_menu_item, label=Western European (ISO-8859-1), parent=mnuWesternEuropean}
-mnuWesternEuropean,New={class=radio_menu_item, label=Western European, New (ISO-8859-15), parent=mnuWesternEuropean,New}
-mnuDefault={class=radio_menu_item, label=Default, parent=mnuDefault}
-mnuFolder={class=menu, label=Folder}
-mnuNew={class=menu_item, label=New..., parent=mnuFolder}
-mnuSubscriptions={class=menu_item, label=Subscriptions, parent=mnuFolder}
-mnuCopyFolderTo={class=menu_item, label=Copy Folder To..., parent=mnuFolder}
-mnuMoveFolderTo={class=menu_item, label=Move Folder To..., parent=mnuFolder}
-mnuSelectAllMessages={class=menu_item, label=Select All Messages, parent=mnuFolder}
-mnuMarkMessagesasRead={class=menu_item, label=Mark Messages as Read, parent=mnuFolder}
-mnuExpunge={class=menu_item, label=Expunge, parent=mnuFolder}
-mnuRename={class=menu_item, label=Rename..., parent=mnuFolder}
-mnuDelete={class=menu_item, label=Delete, parent=mnuFolder}
-mnuProperties={class=menu_item, label=Properties, parent=mnuFolder}
-mnuMessage={class=menu, label=Message}
-mnuComposeNewMessage={class=menu_item, label=Compose New Message, parent=mnuMessage}
-mnuOpeninNewWindow={class=menu_item, label=Open in New Window, parent=mnuMessage}
-mnuEditasNewMessage={class=menu_item, label=Edit as New Message..., parent=mnuMessage}
-mnuAddSendertoAddressBook={class=menu_item, label=Add Sender to Address Book, parent=mnuMessage}
-mnuGoTo={class=menu, label=Go To}
-mnuNextMessage={class=menu_item, label=Next Message, parent=mnuNextMessage}
-mnuNextUnreadMessage={class=menu_item, label=Next Unread Message, parent=mnuNextUnreadMessage}
-mnuNextImportantMessage={class=menu_item, label=Next Important Message, parent=mnuNextImportantMessage}
-mnuNextThread={class=menu_item, label=Next Thread, parent=mnuNextThread}
-mnuPreviousMessage={class=menu_item, label=Previous Message, parent=mnuPreviousMessage}
-mnuPreviousUnreadMessage={class=menu_item, label=Previous Unread Message, parent=mnuPreviousUnreadMessage}
-mnuPreviousImportantMessage={class=menu_item, label=Previous Important Message, parent=mnuPreviousImportantMessage}
-mnuReply={class=menu_item, label=Reply, parent=mnuMessage}
-mnuReplytoSender={class=menu_item, label=Reply to Sender, parent=mnuMessage}
-mnuReplytoList={class=menu_item, label=Reply to List, parent=mnuMessage}
-mnuForward={class=menu_item, label=Forward, parent=mnuMessage}
-mnuRedirect={class=menu_item, label=Redirect, parent=mnuMessage}
-mnuMovetoFolder={class=menu_item, label=Move to Folder, parent=mnuMessage}
-mnuCopytoFolder={class=menu_item, label=Copy to Folder, parent=mnuMessage}
-mnuMarkas={class=menu, label=Mark as}
-mnuRead={class=menu_item, label=Read, parent=mnuRead}
-mnuUnread={class=menu_item, label=Unread, parent=mnuUnread}
-mnuImportant={class=menu_item, label=Important, parent=mnuImportant}
-mnuUnimportant={class=menu_item, label=Unimportant, parent=mnuUnimportant}
-mnuJunk={class=menu_item, label=Junk, parent=mnuJunk}
-mnuNotJunk={class=menu_item, label=Not Junk, parent=mnuNotJunk}
-mnuFollowUp={class=menu_item, label=Follow Up..., parent=mnuFollowUp...}
-mnuApplyFilters={class=menu_item, label=Apply Filters, parent=mnuMessage}
-mnuCheckforJunk={class=menu_item, label=Check for Junk, parent=mnuMessage}
-mnuCreateRule={class=menu, label=Create Rule}
-mnuFilteronSubject={class=menu_item, label=Filter on Subject..., parent=mnuFilteronSubject...}
-mnuFilteronSender={class=menu_item, label=Filter on Sender..., parent=mnuFilteronSender...}
-mnuFilteronRecipients={class=menu_item, label=Filter on Recipients..., parent=mnuFilteronRecipients...}
-mnuFilteronMailingList={class=menu_item, label=Filter on Mailing List..., parent=mnuFilteronMailingList...}
-mnuVFolderonSubject={class=menu_item, label=VFolder on Subject..., parent=mnuVFolderonSubject...}
-mnuVFolderonSender={class=menu_item, label=VFolder on Sender..., parent=mnuVFolderonSender...}
-mnuVFolderonRecipients={class=menu_item, label=VFolder on Recipients..., parent=mnuVFolderonRecipients...}
-mnuVFolderonMailingList={class=menu_item, label=VFolder on Mailing List..., parent=mnuVFolderonMailingList...}
-mnuSearch={class=menu, label=Search}
-mnuFindNow={class=menu_item, label=Find Now, parent=mnuSearch}
-mnuClear={class=menu_item, label=Clear, parent=mnuSearch}
-mnuAdvancedSearch={class=menu_item, label=Advanced Search..., parent=mnuSearch}
-mnuSaveSearch={class=menu_item, label=Save Search..., parent=mnuSearch}
-mnuEditSavedSearches={class=menu_item, label=Edit Saved Searches..., parent=mnuSearch}
-mnuCreatevFolderFromSearch={class=menu_item, label=Create vFolder From Search..., parent=mnuSearch}
-mnuHelp={class=menu, label=Help}
-mnuContents={class=menu_item, label=Contents, parent=mnuHelp}
-mnuQuickReference={class=menu_item, label=Quick Reference, parent=mnuHelp}
-mnuSubmitBugReport={class=menu_item, label=Submit Bug Report, parent=mnuHelp}
-mnuAboutEvolution={class=menu_item, label=About Evolution..., parent=mnuHelp}
-pnl3={class=panel, instance_index=3,parent=Evolution-Mail}
-pnl4={class=panel, instance_index=4,parent=Evolution-Mail}
-pnl5={class=panel, instance_index=5,parent=Evolution-Mail}
-btn0={class=push_button, instance_index=0,parent=Evolution-Mail}
-pnl6={class=panel, instance_index=6,parent=Evolution-Mail}
-pnl7={class=panel, instance_index=7,parent=Evolution-Mail}
-btnNew={class=push_button, label=New}
-pnl8={class=panel, instance_index=8,parent=Evolution-Mail}
-pnl9={class=panel, instance_index=9,parent=Evolution-Mail}
-btnSend/Receive={class=push_button, label=Send / Receive}
-pnl10={class=panel, instance_index=10,parent=Evolution-Mail}
-pnl11={class=panel, instance_index=11,parent=Evolution-Mail}
-pnl12={class=panel, instance_index=12,parent=Evolution-Mail}
-btnReply={class=push_button, label=Reply}
-pnl13={class=panel, instance_index=13,parent=Evolution-Mail}
-btnReplytoAll={class=push_button, label=Reply to All}
-pnl14={class=panel, instance_index=14,parent=Evolution-Mail}
-btnForward={class=push_button, label=Forward}
-pnl15={class=panel, instance_index=15,parent=Evolution-Mail}
-pnl16={class=panel, instance_index=16,parent=Evolution-Mail}
-btnMove={class=push_button, label=Move}
-pnl17={class=panel, instance_index=17,parent=Evolution-Mail}
-btnCopy={class=push_button, label=Copy}
-pnl18={class=panel, instance_index=18,parent=Evolution-Mail}
-pnl19={class=panel, instance_index=19,parent=Evolution-Mail}
-btnPrint={class=push_button, label=Print}
-pnl20={class=panel, instance_index=20,parent=Evolution-Mail}
-btnDelete={class=push_button, label=Delete}
-pnl21={class=panel, instance_index=21,parent=Evolution-Mail}
-btnJunk={class=push_button, label=Junk}
-pnl22={class=panel, instance_index=22,parent=Evolution-Mail}
-btnNotJunk={class=push_button, label=Not Junk}
-pnl23={class=panel, instance_index=23,parent=Evolution-Mail}
-btnCancel={class=push_button, label=Cancel}
-pnl24={class=panel, instance_index=24,parent=Evolution-Mail}
-pnl25={class=panel, instance_index=25,parent=Evolution-Mail}
-pnl26={class=panel, instance_index=26,parent=Evolution-Mail}
-btnPrevious={class=push_button, label=Previous}
-pnl27={class=panel, instance_index=27,parent=Evolution-Mail}
-btnNext={class=push_button, label=Next}
-pnl28={class=panel, instance_index=28,parent=Evolution-Mail}
-pnl29={class=panel, instance_index=29,parent=Evolution-Mail}
-ptl0={class=page_tab_list, instance_index=0}
-ptb0={class=page_tab, instance_index=0}
-pnl30={class=panel, instance_index=30,parent=Evolution-Mail}
-pnl31={class=panel, instance_index=31,parent=Evolution-Mail}
-lbl118total={class=label, label=118 total}
-ttblMailFolderTree={class=tree_table, label=Mail Folder Tree}
-tbtnMail={class=toggle_button, label=Mail}
-tbtnContacts={class=toggle_button, label=Contacts}
-tbtnCalendars={class=toggle_button, label=Calendars}
-tbtnTasks={class=toggle_button, label=Tasks}
-ptl1={class=page_tab_list, instance_index=1}
-ptb1={class=page_tab, instance_index=1}
-pnl32={class=panel, instance_index=32,parent=Evolution-Mail}
-pnl33={class=panel, instance_index=33,parent=Evolution-Mail}
-cboSearchType={class=combo_box, label=Search Type}
-mnuSubjectorSendercontains={class=menu_item, label=Subject or Sender contains, parent=mnuSubjectorSendercontains}
-mnuRecipientscontain={class=menu_item, label=Recipients contain, parent=mnuRecipientscontain}
-mnuMessagecontains={class=menu_item, label=Message contains, parent=mnuMessagecontains}
-mnuSubjectcontains={class=menu_item, label=Subject contains, parent=mnuSubjectcontains}
-mnuSendercontains={class=menu_item, label=Sender contains, parent=mnuSendercontains}
-mnuBodycontains={class=menu_item, label=Body contains, parent=mnuBodycontains}
-mnuSubjectorSendercontains={class=menu_item, label=Subject or Sender contains, parent=mnuSubjectorSendercontains}
-mnuAdvancedSearch={class=menu_item, label=Advanced Search..., parent=mnuAdvancedSearch...}
-txtSearchTextEntry={class=text, label=Search Text Entry}
-pnl34={class=panel, instance_index=34,parent=Evolution-Mail}
-btnFindNow={class=push_button, label=Find Now}
-pnl35={class=panel, instance_index=35,parent=Evolution-Mail}
-btnClear={class=push_button, label=Clear}
-ttblMessageList={class=tree_table, label=Message List}
-pnlPanelcontainingHTML={class=panel}
-pnl37={class=panel, instance_index=37,parent=pnlPanelcontainingHTML}
-tbl0={class=table, instance_index=0}
-pnl38={class=panel, instance_index=38,parent=pnlPanelcontainingHTML}
-tbl1={class=table, instance_index=1,parent=pnlPanelcontainingHTML}
-pnl39={class=panel, instance_index=39,parent=pnlPanelcontainingHTML}
-txt1={class=text, instance_index=1,parent=pnlPanelcontainingHTML}
-pnl40={class=panel, instance_index=40,parent=pnlPanelcontainingHTML}
-txt2={class=text, instance_index=2,parent=pnlPanelcontainingHTML}
-pnl41={class=panel, instance_index=41,parent=pnlPanelcontainingHTML}
-txt3={class=text, instance_index=3,parent=pnlPanelcontainingHTML}
-pnl42={class=panel, instance_index=42,parent=pnlPanelcontainingHTML}
-txt4={class=text, instance_index=4,parent=pnlPanelcontainingHTML}
-pnl43={class=panel, instance_index=43,parent=pnlPanelcontainingHTML}
-txt5={class=text, instance_index=5,parent=pnlPanelcontainingHTML}
-pnl44={class=panel, instance_index=44,parent=pnlPanelcontainingHTML}
-txt6={class=text, instance_index=6,parent=pnlPanelcontainingHTML}
-pnl45={class=panel, instance_index=45,parent=pnlPanelcontainingHTML}
-txt7={class=text, instance_index=7,parent=pnlPanelcontainingHTML}
-pnl46={class=panel, instance_index=46,parent=pnlPanelcontainingHTML}
-txt8={class=text, instance_index=8,parent=pnlPanelcontainingHTML}
-pnl47={class=panel, instance_index=47,parent=pnlPanelcontainingHTML}
-pnl48={class=panel, instance_index=48,parent=pnlPanelcontainingHTML}
-pnl49={class=panel, instance_index=49,parent=pnlPanelcontainingHTML}
-btn17={class=push_button, instance_index=17,parent=pnlPanelcontainingHTML}
-lblNoAttachment={class=label, label=No Attachment}
-btnSaveAll={class=push_button, label=Save All}
-paneAttachmentBar={class=layered_pane, label=Attachment Bar}
-pnl50={class=panel, instance_index=50,parent=pnlPanelcontainingHTML}
-tbl2={class=table, instance_index=2,parent=pnlPanelcontainingHTML}
-pnl51={class=panel, instance_index=51,parent=pnlPanelcontainingHTML}
-pnlPanelcontainingHTML={class=panel, label=Panel containing HTML}
-pnl53={class=panel, instance_index=53,parent=pnlPanelcontainingHTML}
-txt9={class=text, instance_index=9,parent=pnlPanelcontainingHTML}
-pnl54={class=panel, instance_index=54,parent=pnlPanelcontainingHTML}
-txt10={class=text, instance_index=10,parent=pnlPanelcontainingHTML}
-pnl55={class=panel, instance_index=55,parent=pnlPanelcontainingHTML}
-txt11={class=text, instance_index=11,parent=pnlPanelcontainingHTML}
-pnl56={class=panel, instance_index=56,parent=pnlPanelcontainingHTML}
-txt12={class=text, instance_index=12,parent=pnlPanelcontainingHTML}
-pnl57={class=panel, instance_index=57,parent=pnlPanelcontainingHTML}
-txt13={class=text, instance_index=13,parent=pnlPanelcontainingHTML}
-btn19={class=push_button, instance_index=19,parent=Evolution-Mail}
-lbl2={class=label, instance_index=2,parent=Evolution-Mail}
-ptl2={class=page_tab_list, instance_index=2}
-ptb2={class=page_tab, instance_index=2}
-pnl58={class=panel, instance_index=58,parent=Evolution-Mail}
-pnl59={class=panel, instance_index=59,parent=Evolution-Mail}
-
-[Composeamessage]
-Composeamessage={class=frame, app_name=evolution, label=Compose a message}
-pnl0={class=panel, instance_index=0,parent=Composeamessage}
-pnl1={class=panel, instance_index=1,parent=Composeamessage}
-pnl2={class=panel, instance_index=2,parent=Composeamessage}
-mnuFile={class=menu, label=File}
-mnuOpen={class=menu_item, label=Open..., parent=mnuFile}
-mnuSend={class=menu_item, label=Send, parent=mnuFile}
-mnuSave={class=menu_item, label=Save, parent=mnuFile}
-mnuSaveAs={class=menu_item, label=Save As..., parent=mnuFile}
-mnuSaveDraft={class=menu_item, label=Save Draft, parent=mnuFile}
-mnuPrintPreview={class=menu_item, label=Print Preview, parent=mnuFile}
-mnuPrint={class=menu_item, label=Print..., parent=mnuFile}
-mnuClose={class=menu_item, label=Close, parent=mnuFile}
-mnuEdit={class=menu, label=Edit}
-mnuUndo={class=menu_item, label=Undo, parent=mnuEdit}
-mnuRedo={class=menu_item, label=Redo, parent=mnuEdit}
-mnuCut={class=menu_item, label=Cut, parent=mnuEdit}
-mnuCopy={class=menu_item, label=Copy, parent=mnuEdit}
-mnuPaste={class=menu_item, label=Paste, parent=mnuEdit}
-mnuPasteQuotation={class=menu_item, label=Paste Quotation, parent=mnuEdit}
-mnuSelectAll={class=menu_item, label=Select All, parent=mnuEdit}
-mnuFind={class=menu_item, label=Find..., parent=mnuEdit}
-mnuFindAgain={class=menu_item, label=Find Again, parent=mnuEdit}
-mnuReplace={class=menu_item, label=Replace..., parent=mnuEdit}
-mnuCharacterEncoding={class=menu, label=Character Encoding}
-mnuBaltic={class=radio_menu_item, label=Baltic (ISO-8859-13), parent=mnuBaltic}
-mnuBaltic={class=radio_menu_item, label=Baltic (ISO-8859-4), parent=mnuBaltic}
-mnuCentralEuropean={class=radio_menu_item, label=Central European (ISO-8859-2), parent=mnuCentralEuropean}
-mnuChinese,Traditional={class=radio_menu_item, label=Chinese, Traditional (Big5), parent=mnuChinese,Traditional}
-mnuChinese,Traditional={class=radio_menu_item, label=Chinese, Traditional (BIG5HKSCS), parent=mnuChinese,Traditional}
-mnuChinese,Traditional={class=radio_menu_item, label=Chinese, Traditional (EUC-TW), parent=mnuChinese,Traditional}
-mnuChinese,Simplified={class=radio_menu_item, label=Chinese, Simplified (GB18030), parent=mnuChinese,Simplified}
-mnuChinese,Simplified={class=radio_menu_item, label=Chinese, Simplified (GB2312), parent=mnuChinese,Simplified}
-mnuChinese,Simplified={class=radio_menu_item, label=Chinese, Simplified (HZ), parent=mnuChinese,Simplified}
-mnuChinese,Simplified={class=radio_menu_item, label=Chinese, Simplified (ISO-2022-CN), parent=mnuChinese,Simplified}
-mnuCyrillic={class=radio_menu_item, label=Cyrillic (KOI8-R), parent=mnuCyrillic}
-mnuCyrillic={class=radio_menu_item, label=Cyrillic (Windows-1251), parent=mnuCyrillic}
-mnuCyrillic,Ukrainian={class=radio_menu_item, label=Cyrillic, Ukrainian (KOI8-U), parent=mnuCyrillic,Ukrainian}
-mnuCyrillic={class=radio_menu_item, label=Cyrillic (ISO-8859-5), parent=mnuCyrillic}
-mnuGreek={class=radio_menu_item, label=Greek (ISO-8859-7), parent=mnuGreek}
-mnuHebrew,Visual={class=radio_menu_item, label=Hebrew, Visual (ISO-8859-8), parent=mnuHebrew,Visual}
-mnuJapanese={class=radio_menu_item, label=Japanese (ISO-2022-JP), parent=mnuJapanese}
-mnuJapanese={class=radio_menu_item, label=Japanese (EUC-JP), parent=mnuJapanese}
-mnuJapanese={class=radio_menu_item, label=Japanese (Shift_JIS), parent=mnuJapanese}
-mnuKorean={class=radio_menu_item, label=Korean (EUC-KR), parent=mnuKorean}
-mnuTurkish={class=radio_menu_item, label=Turkish (ISO-8859-9), parent=mnuTurkish}
-mnuUnicode={class=radio_menu_item, label=Unicode (UTF-8), parent=mnuUnicode}
-mnuUnicode={class=radio_menu_item, label=Unicode (UTF-7), parent=mnuUnicode}
-mnuWesternEuropean={class=radio_menu_item, label=Western European (ISO-8859-1), parent=mnuWesternEuropean}
-mnuWesternEuropean,New={class=radio_menu_item, label=Western European, New (ISO-8859-15), parent=mnuWesternEuropean,New}
-mnuSpellCheckDocument={class=menu_item, label=Spell Check Document..., parent=mnuEdit}
-mnuCurrentLanguages={class=menu, label=Current Languages}
-mnuEnglish={class=check_menu_item, label=English (American), parent=mnuEnglish}
-mnuEnglish={class=check_menu_item, label=English (British), parent=mnuEnglish}
-mnuEnglish={class=check_menu_item, label=English (Canadian), parent=mnuEnglish}
-mnuFormat={class=menu, label=Format}
-mnuHTML={class=check_menu_item, label=HTML, parent=mnuFormat}
-mnuStyle={class=menu, label=Style}
-mnuPlaintext={class=menu_item, label=Plain text, parent=mnuStyle}
-mnuBold={class=menu_item, label=Bold, parent=mnuStyle}
-mnuItalic={class=menu_item, label=Italic, parent=mnuStyle}
-mnuUnderline={class=menu_item, label=Underline, parent=mnuStyle}
-mnuStrikeout={class=menu_item, label=Strikeout, parent=mnuStyle}
-mnuFontSize={class=menu, label=Font Size}
-mnu-2={class=menu_item, label=-2, parent=mnu-2}
-mnu-1={class=menu_item, label=-1, parent=mnu-1}
-mnu+0={class=menu_item, label=+0, parent=mnu+0}
-mnu+1={class=menu_item, label=+1, parent=mnu+1}
-mnu+2={class=menu_item, label=+2, parent=mnu+2}
-mnu+3={class=menu_item, label=+3, parent=mnu+3}
-mnuText={class=menu_item, label=Text..., parent=mnuFormat}
-mnuHeading={class=menu, label=Heading, parent=mnuFormat}
-mnuNormal={class=menu_item, label=Normal, parent=mnuHeading}
-mnuHeader1={class=menu_item, label=Header 1, parent=mnuHeading}
-mnuHeader2={class=menu_item, label=Header 2, parent=mnuHeading}
-mnuHeader3={class=menu_item, label=Header 3, parent=mnuHeading}
-mnuHeader4={class=menu_item, label=Header 4, parent=mnuHeading}
-mnuHeader5={class=menu_item, label=Header 5, parent=mnuHeading}
-mnuHeader6={class=menu_item, label=Header 6, parent=mnuHeading}
-mnuBulletedList={class=menu_item, label=Bulleted List, parent=mnuHeading}
-mnuRomanNumeralList={class=menu_item, label=Roman Numeral List, parent=mnuHeading}
-mnuNumberedList={class=menu_item, label=Numbered List, parent=mnuHeading}
-mnuAlphabeticalList={class=menu_item, label=Alphabetical List, parent=mnuHeading}
-mnuAddress={class=menu_item, label=Address, parent=mnuHeading}
-mnuPreformat={class=menu_item, label=Preformat, parent=mnuHeading}
-mnuAlignment={class=menu, label=Alignment}
-mnuLeft={class=menu_item, label=Left, parent=mnuAlignment}
-mnuCenter={class=menu_item, label=Center, parent=mnuAlignment}
-mnuRight={class=menu_item, label=Right, parent=mnuAlignment}
-mnuParagraph={class=menu_item, label=Paragraph..., parent=mnuFormat}
-mnuIncreaseIndent={class=menu_item, label=Increase Indent, parent=mnuFormat}
-mnuDecreaseIndent={class=menu_item, label=Decrease Indent, parent=mnuFormat}
-mnuWrapLines={class=menu_item, label=Wrap Lines, parent=mnuFormat}
-mnuPage={class=menu_item, label=Page..., parent=mnuFormat}
-mnuView={class=menu, label=View}
-mnuFromField={class=check_menu_item, label=From Field, parent=mnuView}
-mnuToField={class=check_menu_item, label=To Field, parent=mnuView}
-mnuPost-ToField={class=check_menu_item, label=Post-To Field, parent=mnuView}
-mnuReply-ToField={class=check_menu_item, label=Reply-To Field, parent=mnuView}
-mnuCcField={class=check_menu_item, label=Cc Field, parent=mnuView}
-mnuBccField={class=check_menu_item, label=Bcc Field, parent=mnuView}
-mnuInsert={class=menu, label=Insert}
-mnuAttachment={class=menu_item, label=Attachment..., parent=mnuInsert}
-mnuSendOptions={class=menu_item, label=Send Options, parent=mnuInsert}
-mnuImage={class=menu_item, label=Image..., parent=mnuInsert}
-mnuLink={class=menu_item, label=Link..., parent=mnuInsert}
-mnuRule={class=menu_item, label=Rule..., parent=mnuInsert}
-mnuTable={class=menu_item, label=Table..., parent=mnuInsert}
-mnuTextfile={class=menu_item, label=Text file..., parent=mnuInsert}
-mnuHTMLfile={class=menu_item, label=HTML file..., parent=mnuInsert}
-mnuSmiley={class=menu, label=Smiley}
-mnuSmile={class=menu_item, label=Smile, parent=mnuSmiley}
-mnuWink={class=menu_item, label=Wink, parent=mnuSmiley}
-mnuSurprised={class=menu_item, label=Surprised, parent=mnuSmiley}
-mnuLaughing={class=menu_item, label=Laughing, parent=mnuSmiley}
-mnuOhno!={class=menu_item, label=Oh no!, parent=mnuSmiley}
-mnuFrown={class=menu_item, label=Frown, parent=mnuSmiley}
-mnuIndifferent={class=menu_item, label=Indifferent, parent=mnuSmiley}
-mnuUndecided={class=menu_item, label=Undecided, parent=mnuSmiley}
-mnuLick={class=menu_item, label=Lick, parent=mnuSmiley}
-mnuCrying={class=menu_item, label=Crying, parent=mnuSmiley}
-mnuSick={class=menu_item, label=Sick, parent=mnuSmiley}
-mnuRequestreadreceipt={class=check_menu_item, label=Request read receipt, parent=mnuInsert}
-mnuSecurity={class=menu, label=Security}
-mnuPGPSign={class=check_menu_item, label=PGP Sign, parent=mnuSecurity}
-mnuPGPEncrypt={class=check_menu_item, label=PGP Encrypt, parent=mnuSecurity}
-mnuS/MIMESign={class=check_menu_item, label=S/MIME Sign, parent=mnuSecurity}
-mnuS/MIMEEncrypt={class=check_menu_item, label=S/MIME Encrypt, parent=mnuSecurity}
-pnl3={class=panel, instance_index=3,parent=Composeamessage}
-pnl4={class=panel, instance_index=4,parent=Composeamessage}
-pnl5={class=panel, instance_index=5,parent=Composeamessage}
-btnSend={class=push_button, label=Send}
-pnl6={class=panel, instance_index=6,parent=Composeamessage}
-btnAttach={class=push_button, label=Attach}
-pnl7={class=panel, instance_index=7,parent=Composeamessage}
-pnl8={class=panel, instance_index=8,parent=Composeamessage}
-btnUndo={class=push_button, label=Undo}
-pnl9={class=panel, instance_index=9,parent=Composeamessage}
-btnRedo={class=push_button, label=Redo}
-pnl10={class=panel, instance_index=10,parent=Composeamessage}
-pnl11={class=panel, instance_index=11,parent=Composeamessage}
-btnCut={class=push_button, label=Cut}
-pnl12={class=panel, instance_index=12,parent=Composeamessage}
-btnCopy={class=push_button, label=Copy}
-pnl13={class=panel, instance_index=13,parent=Composeamessage}
-btnPaste={class=push_button, label=Paste}
-pnl14={class=panel, instance_index=14,parent=Composeamessage}
-pnl15={class=panel, instance_index=15,parent=Composeamessage}
-btnFind={class=push_button, label=Find}
-pnl16={class=panel, instance_index=16,parent=Composeamessage}
-btnReplace={class=push_button, label=Replace}
-pnl17={class=panel, instance_index=17,parent=Composeamessage}
-pnl18={class=panel, instance_index=18,parent=Composeamessage}
-btnImage={class=push_button, label=Image}
-pnl19={class=panel, instance_index=19,parent=Composeamessage}
-btnLink={class=push_button, label=Link}
-pnl20={class=panel, instance_index=20,parent=Composeamessage}
-btnRule={class=push_button, label=Rule}
-pnl21={class=panel, instance_index=21,parent=Composeamessage}
-btnTable={class=push_button, label=Table}
-pnl22={class=panel, instance_index=22,parent=Composeamessage}
-txtSubject={class=text, label_by=Subject:}
-lblSubject={class=label, label=Subject:}
-txtPostTo={class=text, label=Post To:}
-btnPostTo={class=push_button, label=Post To:}
-txtBcc={class=text, label=Bcc:}
-btnBcc={class=push_button, label=Bcc:}
-txtCc={class=text, label=Cc:}
-btnCc={class=push_button, label=Cc:}
-txtTo={class=text, label=To:}
-btnTo={class=push_button, label=To:}
-txt5={class=text, instance_index=5,parent=Composeamessage}
-lblReply-To={class=label, label=Reply-To:}
-cbopremkumar<jpremkumar@novell.com>={class=combo_box, label=premkumar <jpremkumar@novell.com>}
-mnupremkumar<jpremkumar@novell={class=menu_item, label=premkumar <jpremkumar@novell.com>, parent=mnupremkumar<jpremkumar@novell.com>}
-lblSignature={class=label, label=Signature:}
-cboNone={class=combo_box, label=None}
-mnuNone={class=menu_item, label=None, parent=mnuNone}
-mnuAutogenerated={class=menu_item, label=Autogenerated, parent=mnuNone}
-lblFrom={class=label, label=From:}
-pnl23={class=panel, instance_index=23,parent=Composeamessage}
-pnl24={class=panel, instance_index=24,parent=Composeamessage}
-cbo+0={class=combo_box, label=+0}
-mnu-2={class=menu_item, label=-2, parent=mnu+0}
-mnu-1={class=menu_item, label=-1, parent=mnu+0}
-mnu+0={class=menu_item, label=+0, parent=mnu+0}
-mnu+1={class=menu_item, label=+1, parent=mnu+0}
-mnu+2={class=menu_item, label=+2, parent=mnu+0}
-mnu+3={class=menu_item, label=+3, parent=mnu+0}
-mnu+4={class=menu_item, label=+4, parent=mnu+0}
-cboNormal={class=combo_box, label=Normal}
-mnuNormal={class=menu_item, label=Normal, parent=mnuNormal}
-mnuPreformat={class=menu_item, label=Preformat, parent=mnuNormal}
-mnuBulletedList={class=menu_item, label=Bulleted List, parent=mnuNormal}
-mnuNumberedList={class=menu_item, label=Numbered List, parent=mnuNormal}
-mnuRomanList={class=menu_item, label=Roman List, parent=mnuNormal}
-mnuAlphabeticalList={class=menu_item, label=Alphabetical List, parent=mnuNormal}
-mnuHeader1={class=menu_item, label=Header 1, parent=mnuNormal}
-mnuHeader2={class=menu_item, label=Header 2, parent=mnuNormal}
-mnuHeader3={class=menu_item, label=Header 3, parent=mnuNormal}
-mnuHeader4={class=menu_item, label=Header 4, parent=mnuNormal}
-mnuHeader5={class=menu_item, label=Header 5, parent=mnuNormal}
-mnuHeader6={class=menu_item, label=Header 6, parent=mnuNormal}
-mnuAddress={class=menu_item, label=Address, parent=mnuNormal}
-tbtnTypewriter={class=toggle_button, label=Typewriter}
-tbtnBold={class=toggle_button, label=Bold}
-tbtnItalic={class=toggle_button, label=Italic}
-tbtnUnderline={class=toggle_button, label=Underline}
-tbtnStrikeout={class=toggle_button, label=Strikeout}
-rdoLeftalign={class=radio_button, label=Left align}
-rdoCenter={class=radio_button, label=Center}
-rdoRightalign={class=radio_button, label=Right align}
-btnUnindent={class=push_button, label=Unindent}
-btnIndent={class=push_button, label=Indent}
-btncolorpreview={class=push_button, label=color preview}
-tbtnPopup={class=toggle_button, label=Popup}
-pnlPanelcontainingHTML={class=panel, label=Panel containing HTML,parent=Composeamessage}
-pnl26={class=panel, instance_index=26,parent=pnlPanelcontainingHTML}
-txt6={class=text, instance_index=6}
-lblAttachmentBar={class=label, label=Attachment Bar}
-lbl5={class=label, instance_index=5,parent=Composeamessage}
-paneAttachmentBar={class=layered_pane, label=Attachment Bar}
-
-[dlgSelectfolder]
-dlgSelectfolder={class=dialog, label=Select folder, app_name=evolution}
-ttblMailFolderTree={class=tree_table, label=Mail Folder Tree}
-btnCopy={class=push_button, label=Copy}
-btnMove={class=push_button, label=Move}
-btnCancel={class=push_button, label=Cancel}
-btnNew={class=push_button, label=New}
-
-[dlgAttachfile]
-dlgAttachfile={class=dialog, label=Attach file(s), app_name=evolution}
-pnl0={class=panel, instance_index=0,parent=dlgAttachfile}
-cboHome={class=combo_box, label=Home}
-lbl0={class=label, instance_index=0,parent=dlgAttachfile}
-txt0={class=text, instance_index=0,parent=dlgAttachfile}
-lblName={class=label, label=Name:}
-pnl1={class=panel, instance_index=1,parent=dlgAttachfile}
-tbtnBrowseforotherfolders={class=toggle_button, label=Browse for other folde\rs}
-tblShortcuts={class=table, label=Shortcuts}
-btnAdd={class=push_button, label=Add}
-btnRemove={class=push_button, label=Remove}
-pnl2={class=panel, instance_index=2,parent=dlgAttachfile}
-tbtnHome={class=toggle_button, label=Home}
-btn2={class=push_button, instance_index=2,parent=dlgAttachfile}
-btn3={class=push_button, instance_index=3,parent=dlgAttachfile}
-btnCreateFolder={class=push_button, label=Create Folder}
-tblFiles={class=table, label=Files}
-cbo1={class=combo_box, instance_index=1,parent=dlgAttachfile}
-pnl3={class=panel, instance_index=3,parent=dlgAttachfile}
-chkSuggestautomaticdisplayofattachment={class=check_box, label=Suggest autom\atic display of attachment}
-btnAttach={class=push_button, label=Attach}
-btnCancel={class=push_button, label=Cancel}
-
-
-[Readonlyframe]
-Readonlyframe={class=frame, app_name=evolution, label=Readonlyframe}
-pnl0={class=panel, instance_index=0,parent=Readonlyframe}
-pnl1={class=panel, instance_index=1,parent=Readonlyframe}
-pnl2={class=panel, instance_index=2,parent=Readonlyframe}
-mnuFile={class=menu, label=File}
-mnuSaveMessage={class=menu_item, label=Save Message..., parent=mnuFile}
-mnuPrintPreview={class=menu_item, label=Print Preview, parent=mnuFile}
-mnuPrint={class=menu_item, label=Print..., parent=mnuFile}
-mnuClose={class=menu_item, label=Close, parent=mnuFile}
-mnuEdit={class=menu, label=Edit}
-mnuCopy={class=menu_item, label=Copy, parent=mnuEdit}
-mnuSelectAllText={class=menu_item, label=Select All Text, parent=mnuEdit}
-mnuDeleteMessage={class=menu_item, label=Delete Message, parent=mnuEdit}
-mnuUndeleteMessage={class=menu_item, label=Undelete Message, parent=mnuEdit}
-mnuFindinMessage={class=menu_item, label=Find in Message..., parent=mnuEdit}
-mnuView={class=menu, label=View}
-mnuLoadImages={class=menu_item, label=Load Images, parent=mnuView}
-mnuAllMessageHeaders={class=check_menu_item, label=All Message Headers, parent=mnuView}
-mnuCaretMode={class=check_menu_item, label=Caret Mode, parent=mnuView}
-mnuMessageSource={class=menu_item, label=Message Source, parent=mnuView}
-mnuZoomIn={class=menu_item, label=Zoom In, parent=mnuView}
-mnuZoomOut={class=menu_item, label=Zoom Out, parent=mnuView}
-mnuNormalSize={class=menu_item, label=Normal Size, parent=mnuView}
-mnuCharacterEncoding={class=menu, label=Character Encoding}
-mnuBaltic={class=radio_menu_item, label=Baltic (ISO-8859-13), parent=mnuBaltic}
-mnuBaltic={class=radio_menu_item, label=Baltic (ISO-8859-4), parent=mnuBaltic}
-mnuCentralEuropean={class=radio_menu_item, label=Central European (ISO-8859-2), parent=mnuCentralEuropean}
-mnuChinese,Traditional={class=radio_menu_item, label=Chinese, Traditional (Big5), parent=mnuChinese,Traditional}
-mnuChinese,Traditional={class=radio_menu_item, label=Chinese, Traditional (BIG5HKSCS), parent=mnuChinese,Traditional}
-mnuChinese,Traditional={class=radio_menu_item, label=Chinese, Traditional (EUC-TW), parent=mnuChinese,Traditional}
-mnuChinese,Simplified={class=radio_menu_item, label=Chinese, Simplified (GB18030), parent=mnuChinese,Simplified}
-mnuChinese,Simplified={class=radio_menu_item, label=Chinese, Simplified (GB2312), parent=mnuChinese,Simplified}
-mnuChinese,Simplified={class=radio_menu_item, label=Chinese, Simplified (HZ), parent=mnuChinese,Simplified}
-mnuChinese,Simplified={class=radio_menu_item, label=Chinese, Simplified (ISO-2022-CN), parent=mnuChinese,Simplified}
-mnuCyrillic={class=radio_menu_item, label=Cyrillic (KOI8-R), parent=mnuCyrillic}
-mnuCyrillic={class=radio_menu_item, label=Cyrillic (Windows-1251), parent=mnuCyrillic}
-mnuCyrillic,Ukrainian={class=radio_menu_item, label=Cyrillic, Ukrainian (KOI8-U), parent=mnuCyrillic,Ukrainian}
-mnuCyrillic={class=radio_menu_item, label=Cyrillic (ISO-8859-5), parent=mnuCyrillic}
-mnuGreek={class=radio_menu_item, label=Greek (ISO-8859-7), parent=mnuGreek}
-mnuHebrew,Visual={class=radio_menu_item, label=Hebrew, Visual (ISO-8859-8), parent=mnuHebrew,Visual}
-mnuJapanese={class=radio_menu_item, label=Japanese (ISO-2022-JP), parent=mnuJapanese}
-mnuJapanese={class=radio_menu_item, label=Japanese (EUC-JP), parent=mnuJapanese}
-mnuJapanese={class=radio_menu_item, label=Japanese (Shift_JIS), parent=mnuJapanese}
-mnuKorean={class=radio_menu_item, label=Korean (EUC-KR), parent=mnuKorean}
-mnuTurkish={class=radio_menu_item, label=Turkish (ISO-8859-9), parent=mnuTurkish}
-mnuUnicode={class=radio_menu_item, label=Unicode (UTF-8), parent=mnuUnicode}
-mnuUnicode={class=radio_menu_item, label=Unicode (UTF-7), parent=mnuUnicode}
-mnuWesternEuropean={class=radio_menu_item, label=Western European (ISO-8859-1), parent=mnuWesternEuropean}
-mnuWesternEuropean,New={class=radio_menu_item, label=Western European, New (ISO-8859-15), parent=mnuWesternEuropean,New}
-mnuDefault={class=radio_menu_item, label=Default, parent=mnuDefault}
-mnuMessage={class=menu, label=Message}
-mnuComposeNewMessage={class=menu_item, label=Compose New Message, parent=mnuMessage}
-mnuOpeninNewWindow={class=menu_item, label=Open in New Window, parent=mnuMessage}
-mnuEditasNewMessage={class=menu_item, label=Edit as New Message..., parent=mnuMessage}
-mnuAddSendertoAddressBook={class=menu_item, label=Add Sender to Address Book, parent=mnuMessage}
-mnuGoTo={class=menu, label=Go To}
-mnuNextMessage={class=menu_item, label=Next Message, parent=mnuNextMessage}
-mnuNextUnreadMessage={class=menu_item, label=Next Unread Message, parent=mnuNextUnreadMessage}
-mnuNextImportantMessage={class=menu_item, label=Next Important Message, parent=mnuNextImportantMessage}
-mnuNextThread={class=menu_item, label=Next Thread, parent=mnuNextThread}
-mnuPreviousMessage={class=menu_item, label=Previous Message, parent=mnuPreviousMessage}
-mnuPreviousUnreadMessage={class=menu_item, label=Previous Unread Message, parent=mnuPreviousUnreadMessage}
-mnuPreviousImportantMessage={class=menu_item, label=Previous Important Message, parent=mnuPreviousImportantMessage}
-mnuReply={class=menu_item, label=Reply, parent=mnuMessage}
-mnuReplytoSender={class=menu_item, label=Reply to Sender, parent=mnuMessage}
-mnuReplytoList={class=menu_item, label=Reply to List, parent=mnuMessage}
-mnuForward={class=menu_item, label=Forward, parent=mnuMessage}
-mnuRedirect={class=menu_item, label=Redirect, parent=mnuMessage}
-mnuMovetoFolder={class=menu_item, label=Move to Folder, parent=mnuMessage}
-mnuCopytoFolder={class=menu_item, label=Copy to Folder, parent=mnuMessage}
-mnuMarkas={class=menu, label=Mark as}
-mnuRead={class=menu_item, label=Read, parent=mnuRead}
-mnuUnread={class=menu_item, label=Unread, parent=mnuUnread}
-mnuImportant={class=menu_item, label=Important, parent=mnuImportant}
-mnuUnimportant={class=menu_item, label=Unimportant, parent=mnuUnimportant}
-mnuJunk={class=menu_item, label=Junk, parent=mnuJunk}
-mnuNotJunk={class=menu_item, label=Not Junk, parent=mnuNotJunk}
-mnuFollowUp={class=menu_item, label=Follow Up..., parent=mnuFollowUp...}
-mnuApplyFilters={class=menu_item, label=Apply Filters, parent=mnuMessage}
-mnuCheckforJunk={class=menu_item, label=Check for Junk, parent=mnuMessage}
-mnuCreateRule={class=menu, label=Create Rule}
-mnuFilteronSubject={class=menu_item, label=Filter on Subject..., parent=mnuFilteronSubject...}
-mnuFilteronSender={class=menu_item, label=Filter on Sender..., parent=mnuFilteronSender...}
-mnuFilteronRecipients={class=menu_item, label=Filter on Recipients..., parent=mnuFilteronRecipients...}
-mnuFilteronMailingList={class=menu_item, label=Filter on Mailing List..., parent=mnuFilteronMailingList...}
-mnuVFolderonSubject={class=menu_item, label=VFolder on Subject..., parent=mnuVFolderonSubject...}
-mnuVFolderonSender={class=menu_item, label=VFolder on Sender..., parent=mnuVFolderonSender...}
-mnuVFolderonRecipients={class=menu_item, label=VFolder on Recipients..., parent=mnuVFolderonRecipients...}
-mnuVFolderonMailingList={class=menu_item, label=VFolder on Mailing List..., parent=mnuVFolderonMailingList...}
-mnuMailingList={class=menu, label=Mailing List}
-mnuGetlistusageinformation={class=menu_item, label=Get list usage information, parent=mnuGetlistusageinformation}
-mnuSubscribetolist={class=menu_item, label=Subscribe to list, parent=mnuSubscribetolist}
-mnuUn-subscribetolist={class=menu_item, label=Un-subscribe to list, parent=mnuUn-subscribetolist}
-mnuPostmessagetolist={class=menu_item, label=Post message to list, parent=mnuPostmessagetolist}
-mnuContactlistowner={class=menu_item, label=Contact list owner, parent=mnuContactlistowner}
-mnuGetlistarchive={class=menu_item, label=Get list archive, parent=mnuGetlistarchive}
-pnl3={class=panel, instance_index=3,parent=Readonlyframe}
-pnl4={class=panel, instance_index=4,parent=Readonlyframe}
-pnl5={class=panel, instance_index=5,parent=Readonlyframe}
-pnl6={class=panel, instance_index=6,parent=Readonlyframe}
-btnReply={class=push_button, label=Reply}
-pnl7={class=panel, instance_index=7,parent=Readonlyframe}
-btnReplytoAll={class=push_button, label=Reply to All}
-pnl8={class=panel, instance_index=8,parent=Readonlyframe}
-btnForward={class=push_button, label=Forward}
-pnl9={class=panel, instance_index=9,parent=Readonlyframe}
-pnl10={class=panel, instance_index=10,parent=Readonlyframe}
-btnMove={class=push_button, label=Move}
-pnl11={class=panel, instance_index=11,parent=Readonlyframe}
-btnCopy={class=push_button, label=Copy}
-pnl12={class=panel, instance_index=12,parent=Readonlyframe}
-pnl13={class=panel, instance_index=13,parent=Readonlyframe}
-btnPrint={class=push_button, label=Print}
-pnl14={class=panel, instance_index=14,parent=Readonlyframe}
-btnDelete={class=push_button, label=Delete}
-pnl15={class=panel, instance_index=15,parent=Readonlyframe}
-btnJunk={class=push_button, label=Junk}
-pnl16={class=panel, instance_index=16,parent=Readonlyframe}
-btnNotJunk={class=push_button, label=Not Junk}
-pnl17={class=panel, instance_index=17,parent=Readonlyframe}
-pnl18={class=panel, instance_index=18,parent=Readonlyframe}
-pnl19={class=panel, instance_index=19,parent=Readonlyframe}
-btnPrevious={class=push_button, label=Previous}
-pnl20={class=panel, instance_index=20,parent=Readonlyframe}
-btnNext={class=push_button, label=Next}
-pnlPanelcontainingHTML={class=panel, label=Panel containing HTML}
-pnl22={class=panel, instance_index=22,parent=pnlPanelcontainingHTML}
-tbl0={class=table, instance_index=0,parent=pnlPanelcontainingHTML}
-pnl23={class=panel, instance_index=23,parent=pnlPanelcontainingHTML}
-tbl1={class=table, instance_index=1,parent=pnlPanelcontainingHTML}
-pnl24={class=panel, instance_index=24,parent=pnlPanelcontainingHTML}
-txt0={class=text, instance_index=0,parent=pnlPanelcontainingHTML}
-pnl25={class=panel, instance_index=25,parent=pnlPanelcontainingHTML}
-txt1={class=text, instance_index=1,parent=pnlPanelcontainingHTML}
-pnl26={class=panel, instance_index=26,parent=pnlPanelcontainingHTML}
-txt2={class=text, instance_index=2,parent=pnlPanelcontainingHTML}
-pnl27={class=panel, instance_index=27,parent=pnlPanelcontainingHTML}
-txt3={class=text, instance_index=3,parent=pnlPanelcontainingHTML}
-pnl28={class=panel, instance_index=28,parent=pnlPanelcontainingHTML}
-txt4={class=text, instance_index=4,parent=pnlPanelcontainingHTML}
-pnl29={class=panel, instance_index=29,parent=pnlPanelcontainingHTML}
-txt5={class=text, instance_index=5,parent=pnlPanelcontainingHTML}
-pnl30={class=panel, instance_index=30,parent=pnlPanelcontainingHTML}
-txt6={class=text, instance_index=6,parent=pnlPanelcontainingHTML}
-pnl31={class=panel, instance_index=31,parent=pnlPanelcontainingHTML}
-txt7={class=text, instance_index=7,parent=pnlPanelcontainingHTML}
-pnl32={class=panel, instance_index=32,parent=pnlPanelcontainingHTML}
-tbl2={class=table, instance_index=2,parent=pnlPanelcontainingHTML}
-pnl33={class=panel, instance_index=33,parent=pnlPanelcontainingHTML}
-pnlPanelcontainingHTML={class=panel, label=Panel containing HTML}
-pnl35={class=panel, instance_index=35,parent=pnlPanelcontainingHTML}
-txt8={class=text, instance_index=8,parent=pnlPanelcontainingHTML}
-
-[dlgMeeting-Nosummary]
-dlgMeeting-Nosummary={class=dialog, label=Meeting - No summary, app_name=evolution}
-ptlMeeting-Nosummary0={class=page_tab_list, instance_index=0}
-ptabAppointment={class=page_tab, label=Appointment}
-lblBasics={class=label, label=Basics}
-lbl1={class=label, instance_index=1,parent=ptabAppointment}
-pnl0={class=panel, instance_index=0,parent=ptabAppointment}
-lblDescription={class=label, label=Description:}
-txt0={class=text, instance_index=0,parent=ptabAppointment}
-btnCategories={class=push_button, label=Categories...}
-cboPublic={class=combo_box, label=Public}
-mnuPublic={class=menu_item, label=Public, parent=mnuPublic}
-mnuPrivate={class=menu_item, label=Private, parent=mnuPublic}
-mnuConfidential={class=menu_item, label=Confidential, parent=mnuPublic}
-lblCalendar={class=label, label=Calendar:}
-cboPersonal={class=combo_box, label=    Personal}
-mnuOnThisComputer={class=menu_item, label=On This Computer, parent=mnuOnThisComputer}
-mnuPersonal={class=menu_item, label=    Personal, parent=mnuPersonal}
-mnuOnTheWeb={class=menu_item, label=On The Web, parent=mnuOnTheWeb}
-mnunewcalendar={class=menu_item, label=    new calendar, parent=mnunewcalendar}
-mnuContacts={class=menu_item, label=Contacts, parent=mnuContacts}
-mnuBirthdays&Anniversaries={class=menu_item, label=    Birthdays & Anniversaries, parent=mnuBirthdays&Anniversaries}
-mnuWeather={class=menu_item, label=Weather, parent=mnuWeather}
-lblClassification={class=label, label=Classification:}
-txtEventDescription={class=text, label=Event Description}
-txt2={class=text, instance_index=2,parent=ptabAppointment}
-txtLocation={class=text, label_by=Location:}
-lblLocation={class=label, label=Location:}
-txt3={class=text, instance_index=3,parent=ptabAppointment}
-lblSummary={class=label, label=Summary:}
-lblDateandTime={class=label, label=Date and Time}
-lbl8={class=label, instance_index=8,parent=ptabAppointment}
-pnl1={class=panel, instance_index=1,parent=ptabAppointment}
-lblThisappointmenthascustomizedalarms={class=label, label=This appointment has customized alarms}
-cbo15minutesbeforeappointment={class=combo_box, label=15 minutes before appointment}
-mnu15minutesbeforeappointment={class=menu_item, label=15 minutes before appointment, parent=mnu15minutesbeforeappointment}
-mnu1hourbeforeappointment={class=menu_item, label=1 hour before appointment, parent=mnu1hourbeforeappointment}
-mnu1daybeforeappointment={class=menu_item, label=1 day before appointment, parent=mnu1daybeforeappointment}
-btnCustomize={class=push_button, label=Customize...}
-chkAlarm={class=check_box, label=Alarm}
-chkShowtimeasbusy={class=check_box, label=Show time as busy}
-txt4={class=text, instance_index=4,parent=ptabAppointment}
-btnTimezoneButton={class=push_button, label=Timezone Button}
-chkAlldayevent={class=check_box, label=All day event}
-lblEndtime={class=label, label=End time:}
-lblStarttime={class=label, label=Start time:}
-txt5={class=text, instance_index=5,parent=ptabAppointment}
-btnTimezoneButton={class=push_button, label=Timezone Button}
-txtTextDateEntry={class=text, label=Text Date Entry}
-btnDateButton={class=push_button, label=Date Button}
-cboTimeComboBox={class=combo_box, label=Time Combo Box}
-txtEndtime={class=text, label_by=End time:}
-txtTextDateEntry={class=text, label=Text Date Entry}
-btnDateButton={class=push_button, label=Date Button}
-cboTimeComboBox={class=combo_box, label=Time Combo Box}
-txtStarttime={class=text, label_by=Start time:}
-pnlSendOptions={class=panel, label=Send Options}
-pnl3={class=panel, instance_index=3,parent=pnlSendOptions}
-btnAdvancedsendoptions={class=push_button, label=Advanced send options}
-lblSendOptions={class=label, label=Send Options}
-ptabRecurrence={class=page_tab, label=Recurrence}
-lblRecurrence={class=label, label=Recurrence}
-lbl14={class=label, instance_index=14,parent=ptabRecurrence}
-chkThisappointmentrecurs={class=check_box, label=This appointment recurs}
-lblEvery={class=label, label=Every}
-sbtn0={class=spin_button, instance_index=0,parent=ptabRecurrence}
-cboday={class=combo_box, label=day,parent=ptabRecurrence}
-mnuday={class=menu_item, label=day(s), parent=mnuday(s)}
-mnuweek={class=menu_item, label=week(s), parent=mnuday(s)}
-mnumonth={class=menu_item, label=month(s), parent=mnuday(s)}
-mnuyear={class=menu_item, label=year(s), parent=mnuday(s)}
-pnl4={class=panel, instance_index=4,parent=ptabRecurrence}
-lblonthe={class=label, label=on the}
-cbo1st={class=combo_box, label=1st}
-mnufirst={class=menu_item, label=first, parent=mnu1st}
-mnusecond={class=menu_item, label=second, parent=mnu1st}
-mnuthird={class=menu_item, label=third, parent=mnu1st}
-mnufourth={class=menu_item, label=fourth, parent=mnu1st}
-mnulast={class=menu_item, label=last, parent=mnu1st}
-mnu1st={class=menu_item, label=1st, parent=mnu1st}
-mnuOtherDate={class=menu, label=Other Date}
-mnu1stto10th={class=menu, label=1st to 10th}
-mnu1st={class=menu_item, label=1st, parent=mnu1st}
-mnu2nd={class=menu_item, label=2nd, parent=mnu2nd}
-mnu3rd={class=menu_item, label=3rd, parent=mnu3rd}
-mnu4th={class=menu_item, label=4th, parent=mnu4th}
-mnu5th={class=menu_item, label=5th, parent=mnu5th}
-mnu6th={class=menu_item, label=6th, parent=mnu6th}
-mnu7th={class=menu_item, label=7th, parent=mnu7th}
-mnu8th={class=menu_item, label=8th, parent=mnu8th}
-mnu9th={class=menu_item, label=9th, parent=mnu9th}
-mnu10th={class=menu_item, label=10th, parent=mnu10th}
-mnu11thto20th={class=menu, label=11th to 20th}
-mnu11th={class=menu_item, label=11th, parent=mnu11th}
-mnu12th={class=menu_item, label=12th, parent=mnu12th}
-mnu13th={class=menu_item, label=13th, parent=mnu13th}
-mnu14th={class=menu_item, label=14th, parent=mnu14th}
-mnu15th={class=menu_item, label=15th, parent=mnu15th}
-mnu16th={class=menu_item, label=16th, parent=mnu16th}
-mnu17th={class=menu_item, label=17th, parent=mnu17th}
-mnu18th={class=menu_item, label=18th, parent=mnu18th}
-mnu19th={class=menu_item, label=19th, parent=mnu19th}
-mnu20th={class=menu_item, label=20th, parent=mnu20th}
-mnu21stto31st={class=menu, label=21st to 31st}
-mnu21st={class=menu_item, label=21st, parent=mnu21st}
-mnu22nd={class=menu_item, label=22nd, parent=mnu22nd}
-mnu23rd={class=menu_item, label=23rd, parent=mnu23rd}
-mnu24th={class=menu_item, label=24th, parent=mnu24th}
-mnu25th={class=menu_item, label=25th, parent=mnu25th}
-mnu26th={class=menu_item, label=26th, parent=mnu26th}
-mnu27th={class=menu_item, label=27th, parent=mnu27th}
-mnu28th={class=menu_item, label=28th, parent=mnu28th}
-mnu29th={class=menu_item, label=29th, parent=mnu29th}
-mnu30th={class=menu_item, label=30th, parent=mnu30th}
-mnu31st={class=menu_item, label=31st, parent=mnu31st}
-cboday={class=combo_box, label=day}
-mnuday={class=menu_item, label=day, parent=mnuday}
-mnuMonday={class=menu_item, label=Monday, parent=mnuday}
-mnuTuesday={class=menu_item, label=Tuesday, parent=mnuday}
-mnuWednesday={class=menu_item, label=Wednesday, parent=mnuday}
-mnuThursday={class=menu_item, label=Thursday, parent=mnuday}
-mnuFriday={class=menu_item, label=Friday, parent=mnuday}
-mnuSaturday={class=menu_item, label=Saturday, parent=mnuday}
-mnuSunday={class=menu_item, label=Sunday, parent=mnuday}
-cboforever={class=combo_box, label=forever}
-mnufor={class=menu_item, label=for, parent=mnuforever}
-mnuuntil={class=menu_item, label=until, parent=mnuforever}
-mnuforever={class=menu_item, label=forever, parent=mnuforever}
-pnl5={class=panel, instance_index=5,parent=ptabRecurrence}
-sbtn1={class=spin_button, instance_index=1,parent=ptabRecurrence}
-lbloccurrences={class=label, label=occurrences}
-pnl6={class=panel, instance_index=6,parent=ptabRecurrence}
-lblExceptions={class=label, label=Exceptions}
-lbl19={class=label, instance_index=19,parent=ptabRecurrence}
-tbl0={class=table, instance_index=0,parent=ptabRecurrence}
-btnAdd={class=push_button, label=Add}
-btnEdit={class=push_button, label=Edit}
-btnRemove={class=push_button, label=Remove}
-lblPreview={class=label, label=Preview}
-lbl21={class=label, instance_index=21,parent=ptabRecurrence}
-pnl7={class=panel, instance_index=7,parent=ptabRecurrence}
-paneMonthCalendar={class=layered_pane, label=Month Calendar}
-pnl8={class=panel, instance_index=8,parent=paneMonthCalendar}
-pnl9={class=panel, instance_index=9,parent=paneMonthCalendar}
-btnPreviousButton={class=push_button, label=Previous Button}
-pnl10={class=panel, instance_index=10,parent=paneMonthCalendar}
-btnPreviousButton={class=push_button, label=Previous Button}
-ptabScheduling={class=page_tab, label=Scheduling}
-pnl11={class=panel, instance_index=11,parent=ptabScheduling}
-pnl12={class=panel, instance_index=12,parent=ptabScheduling}
-pnl13={class=panel, instance_index=13,parent=ptabScheduling}
-lblEndtime={class=label, label=End time:}
-txtTextDateEntry={class=text, label=Text Date Entry}
-btnDateButton={class=push_button, label=Date Button}
-cboTimeComboBox={class=combo_box, label=Time Combo Box}
-txtStarttime={class=text, label_by=Start time:}
-lblStarttime={class=label, label=Start time:}
-txtTextDateEntry={class=text, label=Text Date Entry}
-btnDateButton={class=push_button, label=Date Button}
-cboTimeComboBox={class=combo_box, label=Time Combo Box}
-txtAutopick={class=text, label_by=Autopick}
-btn<<={class=push_button, label=<<}
-btnAutopick={class=push_button, label=Autopick}
-btn>>={class=push_button, label=>>}
-btnContacts={class=push_button, label=Contacts...}
-btnOptions={class=push_button, label=Options}
-lblTentative={class=label, label=Tentative}
-lblBusy={class=label, label=Busy}
-lblOutofOffice={class=label, label=Out of Office}
-lblNoInformation={class=label, label=No Information}
-pane1={class=layered_pane, instance_index=1,parent=ptabScheduling}
-pnl14={class=panel, instance_index=14,parent=ptabScheduling}
-pane2={class=layered_pane, instance_index=2,parent=ptabScheduling}
-pnl15={class=panel, instance_index=15,parent=ptabScheduling}
-tbl1={class=table, instance_index=1,parent=ptabScheduling}
-ptabInvitations={class=page_tab, label=Invitations}
-lblOrganizer={class=label, label=Organizer:}
-cboOrganizer={class=combo_box, label=Organizer}
-txt14={class=text, instance_index=14,parent=cboOrganizer}
-lblOrganizer={class=label, label=Organizer:}
-lblNone={class=label, label=None}
-btnChangeOrganizer={class=push_button, label=Change Organizer}
-lblAttendees={class=label, label=Attendees}
-lbl32={class=label, instance_index=32,parent=ptabInvitations}
-tbl2={class=table, instance_index=2,parent=ptabInvitations}
-btnAdd={class=push_button, label=Add, parent=ptabInvitations}
-btnRemove={class=push_button, label=Remove}
-btnContacts={class=push_button, label=Contacts...}
-lblAttachmentBar={class=label, label=Attachment Bar (drop attachments here)}
-lbl34={class=label, instance_index=34,parent=dlgMeeting-Nosummary}
-paneAttachmentBar={class=layered_pane, label=Attachment Bar}
-btnHelp={class=push_button, label=Help}
-btnOK={class=push_button, label=OK}
-btnCancel={class=push_button, label=Cancel}
-
-[dlgCategories]
-dlgCategories={class=dialog, label=Categories, app_name=evolution}
-pnl0={class=panel, instance_index=0,parent=dlgCategories}
-btnNew={class=push_button, label=New}
-btnEdit={class=push_button, label=Edit}
-btnDelete={class=push_button, label=Delete}
-tbl0={class=table, instance_index=0}
-lblAvailableCategories={class=label, label=Available Categories:}
-lblItem={class=label, label=Item(s) belong to these categories:}
-txt0={class=text, instance_index=0}
-btnOK={class=push_button, label=OK}
-btnCancel={class=push_button, label=Cancel}
-
-[dlgAddexception]
-dlgAddexception={class=dialog, label=Add exception, app_name=evolution}
-txtTextDateEntry={class=text, label=Text Date Entry}
-btnDateButton={class=push_button, label=Date Button}
-cboTimeComboBox={class=combo_box, label=Time Combo Box}
-txt1={class=text, instance_index=1,parent=cboTimeComboBox}
-btnOK={class=push_button, label=OK}
-btnCancel={class=push_button, label=Cancel}
-
-[dlgEvolutionQuery]
-dlgEvolutionQuery={class=dialog, label=Evolution Query, app_name=evolution}
-lblWouldyouliketosendmeetinginvitationstoparticipants?
-
-EmailinvitationswillbesenttoallparticipantsandallowthemtoRSVP.={class=label, label=Would you like to send meeting invitations to participants?
-
-Email invitations will be sent to all participants and allow them to RSVP.}
-btnSend={class=push_button, label=Send}
-btnDon'tSend={class=push_button, label=Don't Send}
-
-[dlgNewCalendar]
-dlgNewCalendar={class=dialog, label=New Calendar, app_name=evolution}
-ptlNewCalendar0={class=page_tab_list, instance_index=0, parent=NewCalendar}
-ptb0={class=page_tab, instance_index=0, parent=NewCalendar }
-pnlCalendar={class=panel, label=Calendar}
-pnl1={class=panel, instance_index=1,parent=pnlCalendar}
-pnl2={class=panel, instance_index=2,parent=pnlCalendar}
-sbtn0={class=spin_button, instance_index=0,parent=pnlCalendar}
-cbominutes={class=combo_box, label=minutes}
-mnuminutes={class=menu_item, label=minutes, parent=mnuminutes}
-mnuhours={class=menu_item, label=hours, parent=mnuminutes}
-mnudays={class=menu_item, label=days, parent=mnuminutes}
-mnuweeks={class=menu_item, label=weeks, parent=mnuminutes}
-lblRefresh={class=label, label=Refresh:}
-txt0={class=text, instance_index=0,parent=pnlCalendar}
-lblURL={class=label, label=URL:}
-chkMarkasdefaultfolder={class=check_box, label=Mark as default folder}
-chkCopycalendarcontentslocallyforofflineoperation={class=check_box, label=Copy calendar contents locally for offline operation}
-btn0={class=push_button, instance_index=0,parent=pnlCalendar}
-lblColor={class=label, label=Color:}
-txt1={class=text, instance_index=1,parent=pnlCalendar}
-lblName={class=label, label=Name:}
-lblType={class=label, label=Type:}
-cboOnThisComputer={class=combo_box, label=On This Computer}
-mnuOnThisComputer={class=menu_item, label=On This Computer, parent=mnuOnThisComputer}
-mnuOnTheWeb={class=menu_item, label=On The Web, parent=mnuOnTheWeb}
-mnuContacts={class=menu_item, label=Contacts, parent=mnuContacts}
-mnuWeather={class=menu_item, label=Weather, parent=mnuWeather}
-lblCalendar={class=label, label=Calendar}
-btnOK={class=push_button, label=OK}
-btnCancel={class=push_button, label=Cancel}
-
-[dlgAppointment-Nosummary]
-dlgAppointment-Nosummary={class=dialog, label=Appointment - No summary, app_name=evolution}
-ptlAppointment-Nosummary0={class=page_tab_list, instance_index=0}
-ptabAppointment={class=page_tab, label=Appointment}
-lblBasics={class=label, label=Basics}
-lbl1={class=label, instance_index=1,parent=ptabAppointment}
-pnl0={class=panel, instance_index=0,parent=ptabAppointment}
-lblDescription={class=label, label=Description:}
-txt0={class=text, instance_index=0,parent=ptabAppointment}
-btnCategories={class=push_button, label=Categories...}
-cboPublic={class=combo_box, label=Public}
-mnuPublic={class=menu_item, label=Public, parent=mnuPublic}
-mnuPrivate={class=menu_item, label=Private, parent=mnuPublic}
-mnuConfidential={class=menu_item, label=Confidential, parent=mnuPublic}
-lblCalendar={class=label, label=Calendar:}
-cboPersonal={class=combo_box, label=    Personal}
-mnuOnThisComputer={class=menu_item, label=On This Computer, parent=mnuOnThisComputer}
-mnuPersonal={class=menu_item, label=    Personal, parent=mnuPersonal}
-mnuOnTheWeb={class=menu_item, label=On The Web, parent=mnuOnTheWeb}
-mnuContacts={class=menu_item, label=Contacts, parent=mnuContacts}
-mnuBirthdays&Anniversaries={class=menu_item, label=    Birthdays & Anniversaries, parent=mnuBirthdays&Anniversaries}
-mnuWeather={class=menu_item, label=Weather, parent=mnuWeather}
-lblClassification={class=label, label=Classification:}
-txtEventDescription={class=text, label=Event Description}
-txt2={class=text, instance_index=2,parent=ptabAppointment}
-lblLocation={class=label, label=Location:}
-txtLocation={class=text, label_by=Location:}
-txt3={class=text, instance_index=3,parent=ptabAppointment}
-lblSummary={class=label, label=Summary:}
-lblDateandTime={class=label, label=Date and Time}
-lbl8={class=label, instance_index=8,parent=ptabAppointment}
-pnl1={class=panel, instance_index=1,parent=ptabAppointment}
-lblThisappointmenthascustomizedalarms={class=label, label=This appointment has customized alarms}
-cbo15minutesbeforeappointment={class=combo_box, label=15 minutes before appointment}
-mnu15minutesbeforeappointment={class=menu_item, label=15 minutes before appointment, parent=mnu15minutesbeforeappointment}
-mnu1hourbeforeappointment={class=menu_item, label=1 hour before appointment, parent=mnu1hourbeforeappointment}
-mnu1daybeforeappointment={class=menu_item, label=1 day before appointment, parent=mnu1daybeforeappointment}
-btnCustomize={class=push_button, label=Customize...}
-chkAlarm={class=check_box, label=Alarm}
-chkShowtimeasbusy={class=check_box, label=Show time as busy}
-txt4={class=text, instance_index=4,parent=ptabAppointment}
-btnTimezoneButton={class=push_button, label=Timezone Button}
-chkAlldayevent={class=check_box, label=All day event}
-lblEndtime={class=label, label=End time:}
-lblStarttime={class=label, label=Start time:}
-txt5={class=text, instance_index=5,parent=ptabAppointment}
-btnTimezoneButton={class=push_button, label=Timezone Button}
-txtTextDateEntry={class=text, label=Text Date Entry}
-btnDateButton={class=push_button, label=Date Button}
-cboTimeComboBox={class=combo_box, label=Time Combo Box}
-txtEndtime={class=text, label_by=End time:}
-txtTextDateEntry={class=text, label=Text Date Entry}
-btnDateButton={class=push_button, label=Date Button}
-cboTimeComboBox={class=combo_box, label=Time Combo Box}
-txtStarttime={class=text, label_by=Start time:}
-pnlSendOptions={class=panel, label=Send Options}
-pnl3={class=panel, instance_index=3,parent=pnlSendOptions}
-btnAdvancedsendoptions={class=push_button, label=Advanced send options}
-lblSendOptions={class=label, label=Send Options}
-ptabRecurrence={class=page_tab, label=Recurrence}
-lblRecurrence={class=label, label=Recurrence}
-lbl14={class=label, instance_index=14,parent=ptabRecurrence}
-chkThisappointmentrecurs={class=check_box, label=This appointment recurs}
-lblEvery={class=label, label=Every}
-sbtn0={class=spin_button, instance_index=0,parent=ptabRecurrence}
-cbomonth={class=combo_box, label=month(s)}
-mnuday={class=menu_item, label=day(s), parent=mnumonth(s)}
-mnuweek={class=menu_item, label=week(s), parent=mnumonth(s)}
-mnumonth={class=menu_item, label=month(s), parent=mnumonth(s)}
-mnuyear={class=menu_item, label=year(s), parent=mnumonth(s)}
-pnl4={class=panel, instance_index=4,parent=ptabRecurrence}
-lblonthe={class=label, label=on the}
-cbo1st={class=combo_box, label=1st}
-mnufirst={class=menu_item, label=first, parent=mnu1st}
-mnusecond={class=menu_item, label=second, parent=mnu1st}
-mnuthird={class=menu_item, label=third, parent=mnu1st}
-mnufourth={class=menu_item, label=fourth, parent=mnu1st}
-mnulast={class=menu_item, label=last, parent=mnu1st}
-mnu1st={class=menu_item, label=1st, parent=mnu1st}
-mnuOtherDate={class=menu, label=Other Date}
-mnu1stto10th={class=menu, label=1st to 10th}
-mnu1st={class=menu_item, label=1st, parent=mnu1st}
-mnu2nd={class=menu_item, label=2nd, parent=mnu2nd}
-mnu3rd={class=menu_item, label=3rd, parent=mnu3rd}
-mnu4th={class=menu_item, label=4th, parent=mnu4th}
-mnu5th={class=menu_item, label=5th, parent=mnu5th}
-mnu6th={class=menu_item, label=6th, parent=mnu6th}
-mnu7th={class=menu_item, label=7th, parent=mnu7th}
-mnu8th={class=menu_item, label=8th, parent=mnu8th}
-mnu9th={class=menu_item, label=9th, parent=mnu9th}
-mnu10th={class=menu_item, label=10th, parent=mnu10th}
-mnu11thto20th={class=menu, label=11th to 20th}
-mnu11th={class=menu_item, label=11th, parent=mnu11th}
-mnu12th={class=menu_item, label=12th, parent=mnu12th}
-mnu13th={class=menu_item, label=13th, parent=mnu13th}
-mnu14th={class=menu_item, label=14th, parent=mnu14th}
-mnu15th={class=menu_item, label=15th, parent=mnu15th}
-mnu16th={class=menu_item, label=16th, parent=mnu16th}
-mnu17th={class=menu_item, label=17th, parent=mnu17th}
-mnu18th={class=menu_item, label=18th, parent=mnu18th}
-mnu19th={class=menu_item, label=19th, parent=mnu19th}
-mnu20th={class=menu_item, label=20th, parent=mnu20th}
-mnu21stto31st={class=menu, label=21st to 31st}
-mnu21st={class=menu_item, label=21st, parent=mnu21st}
-mnu22nd={class=menu_item, label=22nd, parent=mnu22nd}
-mnu23rd={class=menu_item, label=23rd, parent=mnu23rd}
-mnu24th={class=menu_item, label=24th, parent=mnu24th}
-mnu25th={class=menu_item, label=25th, parent=mnu25th}
-mnu26th={class=menu_item, label=26th, parent=mnu26th}
-mnu27th={class=menu_item, label=27th, parent=mnu27th}
-mnu28th={class=menu_item, label=28th, parent=mnu28th}
-mnu29th={class=menu_item, label=29th, parent=mnu29th}
-mnu30th={class=menu_item, label=30th, parent=mnu30th}
-mnu31st={class=menu_item, label=31st, parent=mnu31st}
-cboday={class=combo_box, label=day(s)}
-mnuday={class=menu_item, label=day, parent=mnuday}
-mnuMonday={class=menu_item, label=Monday, parent=mnuday}
-mnuTuesday={class=menu_item, label=Tuesday, parent=mnuday}
-mnuWednesday={class=menu_item, label=Wednesday, parent=mnuday}
-mnuThursday={class=menu_item, label=Thursday, parent=mnuday}
-mnuFriday={class=menu_item, label=Friday, parent=mnuday}
-mnuSaturday={class=menu_item, label=Saturday, parent=mnuday}
-mnuSunday={class=menu_item, label=Sunday, parent=mnuday}
-cboforever={class=combo_box, label=forever}
-mnufor={class=menu_item, label=for, parent=mnuforever}
-mnuuntil={class=menu_item, label=until, parent=mnuforever}
-mnuforever={class=menu_item, label=forever, parent=mnuforever}
-pnl5={class=panel, instance_index=5,parent=ptabRecurrence}
-sbtn1={class=spin_button, instance_index=1,parent=ptabRecurrence}
-lbloccurrences={class=label, label=occurrences}
-pnl6={class=panel, instance_index=6,parent=ptabRecurrence}
-lblExceptions={class=label, label=Exceptions}
-lbl18={class=label, instance_index=18,parent=ptabRecurrence}
-tbl0={class=table, instance_index=0,parent=ptabRecurrence}
-btnAdd={class=push_button, label=Add}
-btnEdit={class=push_button, label=Edit}
-btnRemove={class=push_button, label=Remove}
-lblPreview={class=label, label=Preview}
-lbl20={class=label, instance_index=20,parent=ptabRecurrence}
-pnl7={class=panel, instance_index=7,parent=ptabRecurrence}
-paneMonthCalendar={class=layered_pane, label=Month Calendar}
-pnl8={class=panel, instance_index=8,parent=paneMonthCalendar}
-pnl9={class=panel, instance_index=9,parent=paneMonthCalendar}
-btnPreviousButton={class=push_button, label=Previous Button}
-pnl10={class=panel, instance_index=10,parent=paneMonthCalendar}
-btnPreviousButton={class=push_button, label=Previous Button}
-lblAttachmentBar={class=label, label=Attachment Bar (drop attachments here)}
-lbl22={class=label, instance_index=22,parent=dlgAppointment-Nosummary}
-paneAttachmentBar={class=layered_pane, label=Attachment Bar}
-btnHelp={class=push_button, label=Help}
-btnOK={class=push_button, label=OK}
-btnCancel={class=push_button, label=Cancel}
diff --git a/evolution/evolution.py b/evolution/evolution.py
deleted file mode 100644
index 880a566..0000000
--- a/evolution/evolution.py
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/usr/bin/python
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtP
-#
-#  Author:     
-#     Premkumar <jpremkumar@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-# 
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-
-from ldtp import *
-from ldtputils import *
-from evoutils.mail import *
-from evoutils.calendar import *
-import string, sys, os, time
-
-startlog('evolution.log',1)
-
-appmap_path = ''
-
-if len (sys.argv) == 1:
-  if os.access ('./evolution.map', os.F_OK | os.R_OK) == 0:
-    log ('Appmap path missing','error')
-    stoplog ()
-    sys.exit(0);
-  else:
-    appmap_path = '.'
-else:
-  appmap_path = sys.argv[1]
-
-initappmap (appmap_path + '/evolution.map')
-
-launchapp ('evolution')
-
-log ('Evolution Mailer Suite', 'begin')
-
-## MAIL ##
-#Compose mail
-execfile ('compose-mail.py')
-time.sleep (60)
-
-#Reply to a mail
-execfile ('reply-mail.py')
-time.sleep (60)
-
-#Forward a mail
-execfile ('forward-mail.py')
-time.sleep (60)
-
-#Compose mail with attachment
-execfile('compose-mail-w-attachment.py')
-time.sleep (60)
-
-#TODO: Test script for sending html has to be  written
-#To send an HTML file and verify the same.
-#execfile ('sendhtmlmail.py')
-
-#To view a plain text mail
-execfile ('view-mail.py')
-time.sleep (60)
-
-#To move a mail from one directory to another
-execfile ('movemail.py')
-time.sleep (60)
-
-#To copy a mail from one directory to another
-execfile ('copymail.py')
-time.sleep (60)
-
-#To delete a mail from a given directory
-execfile ('deletemail.py')
-time.sleep (60)
-
-log ('Evolution Mailer Suite', 'end')
-
-log ('Evolution Calendar Suite', 'begin')
-
-## MEETING ## 
-time.sleep (3)
-execfile ('create-meeting.py')
-time.sleep (3)
-execfile ('verify-meeting.py')
-
-## APPOINTMENT ##
-time.sleep (3)
-execfile ('create-appointment.py')
-time.sleep (3)
-execfile ('verify-appointment.py')
-
-## CALENDAR ##
-time.sleep (3)
-execfile ('create-calendar.py')
-time.sleep (3)
-
-log ('Evolution Calendar Suite', 'end')
-
-stoplog ()
diff --git a/evolution/evoutils/__init__.py b/evolution/evoutils/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/evolution/evoutils/__init__.py
+++ /dev/null
diff --git a/evolution/evoutils/calendar.py b/evolution/evoutils/calendar.py
deleted file mode 100644
index 29130a7..0000000
--- a/evolution/evoutils/calendar.py
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/usr/bin/python
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Premkumar <jpremkumar@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-from ldtp import *
-from ldtputils import *
-from evoutils.mail import *
-
-#To insert values into an Recurrence tab
-def insert_recurrence (windowname, ptlistname, moncount = '3', on = 'First', day = 'Monday', occurences = '5',
-                       exception = '2'):
-     try: 
-         selecttab (windowname, ptlistname, '1')
-         time.sleep (2)
-         check (windowname, 'chkThisappointmentrecurs')
-         time.sleep(1)
-         #verifycheck (windowname, 'chkThisappointmentrecurs')
-         if stateenabled (windowname, 'btnAdd') == 0:
-              log ('Add button is not enabled', 'cause')
-              raise LdtpExecutionError (0)
-         else:
-              setvalue (windowname, 'sbtn0', moncount)
-              selectitem (windowname, 'cboday', 'month(s)')
-              time.sleep (2)
-              selectitem (windowname, 'cbo1st', on)
-              time.sleep (2)
-              selectitem (windowname, 'cboforever', 'for')
-              time.sleep (2)
-              setvalue (windowname, 'sbtn1', occurences)
-              time.sleep (2)
-              #TODO: After the bug regarding ADD buttons not working is fixed uncomment the following segment of code
-
-              #click (windowname, 'btnAdd')
-              #time.sleep (2)
-              #if guiexist ('dlgAddexception') == 0:
-              #     log ('Failed to open exception add dialog', 'cause')
-              #     raise LdtpExecutionError (0)
-              #else:
-                   #TODO: Logic for calculating the exception date from the given exception number
-                   #and creating an exception for the same
-                   #no_of_months = moncount * exception
-                   #time.sleep (1)
-              
-     except error,msg:
-          print "Problem in inserting recurrence details " + str (msg)
-          log('errorinrecurrencetab','error')
-
-
-#To insert values into an Appointment tab
-def insert_appointment (windowname, ptlistname, summary, location, description, date0, time0,
-                        date1, time1, classification = 'Public', categories = 'Business'):
-     try:
-         print 'windowname is: ' + windowname
-         print 'tablist name is: ' + ptlistname
-         selecttab (windowname, ptlistname, '0')
-         time.sleep (2)
-         settextvalue (windowname,'txt3', summary)
-         if windowname == 'dlgMeeting-Nosummary':
-              setcontext ('Meeting - No summary', 'Meeting - ' + summary)
-         else:
-              setcontext ('Appointment - No summary', 'Appointment - ' + summary)
-         time.sleep (2)
-         if setandverify (windowname, 'txt2',  location) == 0:
-              log ('Failed to set value in location field', 'cause')
-              raise LdtpExecutionError (0)
-         else:
-              comboselect (windowname, 'cboPublic', classification)
-              #TODO: Use verifyselect to verify the previous operation. Currently could not do
-              #due to ambiguos 
-
-              click (windowname, 'btnCategories')
-              time.sleep (3)
-              if guiexist ('dlgCategories') == 0:
-                   log ('Failed to open categories dialog', 'cause')
-                   raise LdtpExecutionError (0)
-              else:              
-                   #NOTE: Here is a small work around for selecting the category because of unclear
-                   #behaviour of the table in the category dialog.
-                   index = gettablerowindex ('dlgCategories', 'tbl0', categories )
-                   selectrowindex ('dlgCategories', 'tbl0', index + 1)
-                   time.sleep (2)
-                   checkrow ('dlgCategories', 'tbl0', index)
-                   time.sleep (2)
-                   if verifysettext ('dlgCategories', 'txt0', categories) == 0:
-                        log ('Failed to select given category', 'cause')
-                        raise LdtpExecutionError (0)
-                   else:
-                        click ('dlgCategories', 'btnOK')
-                        time.sleep (1)
-                        if guiexist ('dlgCategories') == 1:
-                             log ('Failed to close Category dialog', 'cause')
-                             raise LdtpExecutionError (0)
-                        else:
-                             if  setandverify (windowname, 'txtEventDescription', description) == 0:
-                                  log ('Failed to set value in Event description field', 'cause')
-                                  raise LdtpExecutionError (0)
-                             else:
-                                  check (windowname,'chkAlldayevent')
-
-                                  #FIXME: Because of appmap generating same label for both the date fields
-                                  #could not set date into first field
-                                  #settextvalue (windowname, 'txtTextDateEntry2', date0)
-                                  #settextvalue (windowname, 'txtTextDateEntry1', date1)
-
-                                  check ('dlgMeeting-Nosummary','chkAlarm')
-     except error,msg:
-          print "Problem in inserting appointment details " + str (msg)
-          log('errorinappointmenttab','error')
-
diff --git a/evolution/evoutils/mail.py b/evolution/evoutils/mail.py
deleted file mode 100644
index bf8b003..0000000
--- a/evolution/evoutils/mail.py
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/usr/bin/python
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Premkumar <jpremkumar@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-from ldtp import *
-from ldtputils import *
-
-#To set and verify a textbox
-def setandverify (win_name, box_name, value):
-    try:
-        settextvalue (win_name, box_name, value)
-        if verifysettext (win_name, box_name, value) == 0:
-            return 0
-        return 1
-    except:
-        return 0
-
-                                        
-#To populate mail header
-def populate_mail_header (to, subject,body,
-                          cc = '', bcc = ''):
-    try:
-        if to!='' and setandverify ('Composeamessage', 'txtTo', to) == 0:
-            log ('Failed to insert text into To field','error')
-            raise LdtpExecutionError (0)
-        if cc != '' and setandverify ('Composeamessage',
-                                      'txtCc', cc) == 0:
-            log ('Failed to insert text into Cc field','error')
-            raise LdtpExecutionError (0)
-        #Note: I have edited the evolution.map to change 'txt0'
-        #to 'txtSubject'
-        
-        #cant use set and verify since context switching is involved
-        if subject!='':
-            settextvalue ('Composeamessage', 'txtSubject', subject)
-            setcontext ('Compose a message', subject)
-            time.sleep(3)
-            if verifysettext ('Composeamessage', 'txtSubject',
-                              subject) == 0:
-                log ('Failed to insert text into subject Field','error')
-                raise LdtpExecutionError (0)
-        #TODO: Change 'txt6' to some meaningful name in
-        #evolution.map also in the following code
-        if body!='' and setandverify ('Composeamessage', 'txt6',
-                                      body) == 0:
-            log ('Failed to insert text into Body field','error')
-            raise LdtpExecutionError (0)
-        #TODO: Check bcc field
-        return 1
-    except:
-        print 'Compose new message failed '
-        log ('Compose new message failed', 'Fail' )
-
-#To capture image of the ith mail in the given folder
-def capturemailimage (folder_name, i, filename):
-    try:
-        selectmenuitem ('evolution','mnuView;mnuWindow;mnuMail')
-        time.sleep (3)
-        selectrowpartialmatch ('evolution', 'ttblMailFolderTree', folder_name)
-        if i == -1:
-            i = getrowcount ('evolution', 'ttblMessageList') - 1
-        print 'The obtained index is i' + i
-        selectrowindex ('evolution', 'ttblMessageList', i)
-        time.sleep(3)    
-        subject = getcellvalue ('evolution', 'ttblMessageList', i, 4)
-        time.sleep (2)
-        selectmenuitem ('evolution', 'mnuMessage;mnuOpeninNewWindow')
-        setcontext ('Readonlyframe', subject)
-        time.sleep (3)
-        imagecapture ('Readonlyframe', 'IMAGES/'+filename)
-        selectmenuitem ('Readonlyframe', 'mnuFile;mnuClose')
-        time.sleep(2)
-        if guiexist ('Readonlyframe') == 1:
-            log ('Message Window is not close after capturing', 'warning')
-            raise LdtpExecutionError (0)
-        releasecontext ()
-        return 1
-    except:
-        log ('Capturing of mail failed','warning')
-        LdtpExecutionError(0)
-        
-#To verify the ith mail in the given folder with the given image
-def verifymailwithimage (folder_name, mail_index, refimg_filename):
-    try:
-        capturemailimage (folder_name, mail_index, 'IMAGES/cur_mail.png')
-        print 'The difference in image is:' + str (imagecompare ('IMAGES/cur_mail.png', refimg_filename))
-        if imagecompare ('cur_mail.png', refimg_filename) == 0.0:
-            return 1
-        else:
-            return 0
-    except ldtp.error, msg:
-        print 'Comparision failed due to the following error -' + str (msg)
-        log ('Comparision of mail images failed - ref image: ' + refimg_filename , 'error')
-        LdtpExecutionError (0)
-            
-
diff --git a/evolution/filter_from_message_mailinglist.py b/evolution/filter_from_message_mailinglist.py
deleted file mode 100644
index b91e802..0000000
--- a/evolution/filter_from_message_mailinglist.py
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Khasim Shaheed <sshaik@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-
-#Create and Verify Filter from Message on MailingList
-import string, time
-
-#Create Filter
-def create_filter (index, filter_name, folder_name, account_name):
-	try:
-		click ('Evolution-Mail', 'tbtnMail')
-		selectrow ('Evolution-Mail', 'treeTabFolder', 'Mailbox')
-		selectrowindex ('Evolution-Mail', 'treetblMails', index)
-		selectmenuitem ('Evolution-Mail', 'mnuTools;mnuCreateFilterFromMessage;mnuFilteronMailingList')
-		settextvalue('dlgAddFilterRule', 'txtRuleName', filter_name)
-		click ('dlgAddFilterRule', 'btn<clickheretoselectafolder>')
-		click ('dlgSelectFolder', 'btnNew')
-		settextvalue('dlgCreateNewFolder', 'txtFoldername', folder_name)
-		selectrow ('dlgCreateNewFolder', 'treetblMailFolderTree', account_name)
-		click ('dlgCreateNewFolder', 'btnCreate')
-		selectrow ('dlgSelectFolder', 'treetblMailFolderTree', folder_name)
-		click ('dlgSelectFolder', 'btnOK')
-		click ('dlgAddFilterRule', 'btnOK')
-		log ('Create Filter from Message on MailingList', 'pass')
-	except:
-		log ('Create Filter from Message on MailingList', 'fail')
-
-#Verify Filter
-def verify_filter (index, folder_name):
-	try:
-		selectrow ('Evolution-Mail', 'treeTabFolder', 'Mailbox')
-		filter_mail_count = 0
-		mailinglist = getcellvalue ('Evolution-Mail', 'treetblMails', index, 4)
-		total_mail_count = getrowcount ('Evolution-Mail', 'treetblMails')
-		for i in range (0, total_mail_count):
-			temp_mailinglist = getcellvalue ('Evolution-Mail', 'treetblMails', i, 4)
-			if (string.find (temp_mailinglist, mailinglist) >= 0):
-				filter_mail_count = filter_mail_count + 1
-		selectmenuitem ('Evolution-Mail', 'mnuEdit;mnuSelectAll')
-		selectmenuitem ('Evolution-Mail', 'mnuActions;mnuApplyFilters')
-		time.sleep (2)
-		selectrow ('Evolution-Mail', 'treeTabFolder', folder_name)
-		time.sleep (2)
-		folder_mail_count = getrowcount ('Evolution-Mail', 'treetblMails')
-		selectmenuitem ('Evolution-Mail', 'mnuTools;mnuFilters')
-		selectrowindex ('dlgFilters', 'tblFilterRules', 0)
-		click ('dlgFilters', 'btnRemove')
-		click ('dlgFilters', 'btnOK')
-		if (filter_mail_count == folder_mail_count):
-			log ('Verify Filter from Message MailingList', 'pass')
-		else:
-			log ('Verify Filter from Message MailingList', 'fail')
-	except:
-			log ('Verify Filter from Message MailingList', 'fail')
-
-#Getting the data from a file				
-file = open('filter_message_on_mailinglist.dat', 'r')
-argmts = file.readlines()
-index = int (argmts[1].strip( ))
-account_name = argmts[2].strip( )
-filter_name = argmts[3].strip( )
-folder_name = argmts[4].strip( )
-
-#Calling the functions
-log ('Create and Verify Filter from Message on MailingList', 'teststart')
-log ('Create Filter from Message on MailingList', 'teststart')
-create_filter(index, filter_name, folder_name, account_name)
-log ('Create Filter from Message on MailingList', 'testend')
-log ('Verify Filter from Message on MailingList', 'teststart')
-verify_filter (index, folder_name)
-log ('Verify Filter from Message on MailingList', 'testend')
-log ('Create and Verify Filter from Message on MailingList', 'testend')
-
diff --git a/evolution/filter_from_message_recipients.py b/evolution/filter_from_message_recipients.py
deleted file mode 100644
index a99992c..0000000
--- a/evolution/filter_from_message_recipients.py
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Khasim Shaheed <sshaik@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-
-#Create and Verify Filter from Message on Recipients
-import string, time
-
-#Create Filter
-def create_filter (index, filter_name, folder_name, account_name):
-	try:
-		click ('Evolution-Mail', 'tbtnMail')
-		selectrow ('Evolution-Mail', 'treeTabFolder', 'Mailbox')
-		selectrowindex ('Evolution-Mail', 'treetblMails', index)
-		selectmenuitem ('Evolution-Mail', 'mnuTools;mnuCreateFilterFromMessage;mnuFilteronRecipients')
-		settextvalue('dlgAddFilterRule', 'txtRuleName', filter_name)
-		click ('dlgAddFilterRule', 'btn<clickheretoselectafolder>')
-		click ('dlgSelectFolder', 'btnNew')
-		settextvalue('dlgCreateNewFolder', 'txtFoldername', folder_name)
-		selectrow ('dlgCreateNewFolder', 'treetblMailFolderTree', account_name)
-		click ('dlgCreateNewFolder', 'btnCreate')
-		selectrow ('dlgSelectFolder', 'treetblMailFolderTree', folder_name)
-		click ('dlgSelectFolder', 'btnOK')
-		click ('dlgAddFilterRule', 'btnOK')
-		log ('Create Filter from Message on Recipients', 'pass')
-	except:
-		log ('Create Filter from Message on Recipients', 'fail')
-
-#Verify Filter
-def verify_filter (index, folder_name):
-	try:
-		selectrow ('Evolution-Mail', 'treeTabFolder', 'Mailbox')
-		filter_mail_count = 0
-		total_mail_count = getrowcount ('Evolution-Mail', 'treetblMails')
-		check ('Evolution-Mail', 'mnuAsSentFolder')
-		recipient = getcellvalue ('Evolution-Mail', 'treetblMails', index, 3)
-		for i in range (0, total_mail_count):
-			message_recipient = getcellvalue ('Evolution-Mail', 'treetblMails', i, 3)
-			if (string.find (message_recipient, recipient) >= 0):
-				filter_mail_count = filter_mail_count + 1
-		check ('Evolution-Mail', 'mnuMessages')
-		selectmenuitem ('Evolution-Mail', 'mnuEdit;mnuSelectAll')
-		selectmenuitem ('Evolution-Mail', 'mnuActions;mnuApplyFilters')
-		time.sleep (2)
-		selectrow ('Evolution-Mail', 'treeTabFolder', folder_name)
-		time.sleep (2)
-		folder_mail_count = getrowcount ('Evolution-Mail', 'treetblMails')
-		selectmenuitem ('Evolution-Mail', 'mnuTools;mnuFilters')
-		selectrowindex ('dlgFilters', 'tblFilterRules', 0)
-		click ('dlgFilters', 'btnRemove')
-		click ('dlgFilters', 'btnOK')
-		if (filter_mail_count == folder_mail_count):
-			log ('Verify Filter from Message Recipients', 'pass')
-		else:
-			log ('Verify Filter from Message Recipients', 'fail')
-	except:
-			log ('Verify Filter from Message Recipients', 'fail')
-
-#Getting the data from a file				
-file = open('filter_message_on_recipients.dat', 'r')
-argmts = file.readlines()
-index = int (argmts[1].strip( ))
-account_name = argmts[2].strip( )
-filter_name = argmts[3].strip( )
-folder_name = argmts[4].strip( )
-
-#Calling the functions
-log ('Create and Verify Filter from Message on Recipients', 'teststart')
-log ('Create Filter from Message on Recipients', 'teststart')
-#create_filter(index, filter_name, folder_name, account_name)
-log ('Create Filter from Message on Recipients', 'testend')
-log ('Verify Filter from Message on Recipients', 'teststart')
-verify_filter (index, folder_name)
-log ('Verify Filter from Message on Recipients', 'testend')
-log ('Create and Verify Filter from Message on Recipients', 'testend')
-
diff --git a/evolution/filter_from_message_sender.py b/evolution/filter_from_message_sender.py
deleted file mode 100644
index 95a96be..0000000
--- a/evolution/filter_from_message_sender.py
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Khasim Shaheed <sshaik@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-
-#Create and Verify Filter from Message on Sender
-import string, time
-
-#Create Filter
-def create_filter (index, filter_name, folder_name, account_name):
-	try:
-		click ('Evolution-Mail', 'tbtnMail')
-		selectrow ('Evolution-Mail', 'treeTabFolder', 'Mailbox')
-		selectrowindex ('Evolution-Mail', 'treetblMails', index)
-		selectmenuitem ('Evolution-Mail', 'mnuTools;mnuCreateFilterFromMessage;mnuFilteronSender')
-		settextvalue('dlgAddFilterRule', 'txtRuleName', filter_name)
-		click ('dlgAddFilterRule', 'btn<clickheretoselectafolder>')
-		click ('dlgSelectFolder', 'btnNew')
-		settextvalue('dlgCreateNewFolder', 'txtFoldername', folder_name)
-		selectrow ('dlgCreateNewFolder', 'treetblMailFolderTree', account_name)
-		click ('dlgCreateNewFolder', 'btnCreate')
-		selectrow ('dlgSelectFolder', 'treetblMailFolderTree', folder_name)
-		click ('dlgSelectFolder', 'btnOK')
-		click ('dlgAddFilterRule', 'btnOK')
-		log ('Create Filter from Message on Sender', 'pass')
-	except:
-		log ('Create Filter from Message on Sender', 'fail')
-
-#Verify Filter
-def verify_filter (index, folder_name):
-	try:
-		selectrow ('Evolution-Mail', 'treeTabFolder', 'Mailbox')
-		filter_mail_count = 0
-		sender = getcellvalue ('Evolution-Mail', 'treetblMails', index, 3)
-		total_mail_count = getrowcount ('Evolution-Mail', 'treetblMails')
-		for i in range (0, total_mail_count):
-			temp_sender = getcellvalue ('Evolution-Mail', 'treetblMails', i, 3)
-			if (string.find (temp_sender, sender) >= 0):
-				filter_mail_count = filter_mail_count + 1
-		selectmenuitem ('Evolution-Mail', 'mnuEdit;mnuSelectAll')
-		selectmenuitem ('Evolution-Mail', 'mnuActions;mnuApplyFilters')
-		time.sleep (2)
-		selectrow ('Evolution-Mail', 'treeTabFolder', folder_name)
-		time.sleep (2)
-		folder_mail_count = getrowcount ('Evolution-Mail', 'treetblMails')
-		selectmenuitem ('Evolution-Mail', 'mnuTools;mnuFilters')
-		selectrowindex ('dlgFilters', 'tblFilterRules', 0)
-		click ('dlgFilters', 'btnRemove')
-		click ('dlgFilters', 'btnOK')
-		if (filter_mail_count == folder_mail_count):
-			log ('Verify Filter from Message Sender', 'pass')
-		else:
-			log ('Verify Filter from Message Sender', 'fail')
-	except:
-			log ('Verify Filter from Message Sender', 'fail')
-
-#Getting the data from a file				
-file = open('filter_message_on_sender.dat', 'r')
-argmts = file.readlines()
-index = int (argmts[1].strip( ))
-account_name = argmts[2].strip( )
-filter_name = argmts[3].strip( )
-folder_name = argmts[4].strip( )
-
-#Calling the functions
-log ('Create and Verify Filter from Message on Sender', 'teststart')
-log ('Create Filter from Message on Sender', 'teststart')
-create_filter(index, filter_name, folder_name, account_name)
-log ('Create Filter from Message on Sender', 'testend')
-log ('Verify Filter from Message on Sender', 'teststart')
-verify_filter (index, folder_name)
-log ('Verify Filter from Message on Sender', 'testend')
-log ('Create and Verify Filter from Message on Sender', 'testend')
-
diff --git a/evolution/filter_from_message_subject.py b/evolution/filter_from_message_subject.py
deleted file mode 100644
index da72799..0000000
--- a/evolution/filter_from_message_subject.py
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Khasim Shaheed <sshaik@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-
-#Create and Verify Filter from Message on Subject
-import string, time
-
-#Create Filter
-def create_filter (index, filter_name, folder_name, account_name):
-	try:
-		click ('Evolution-Mail', 'tbtnMail')
-		selectrow ('Evolution-Mail', 'treeTabFolder', 'Mailbox')
-		selectrowindex ('Evolution-Mail', 'treetblMails', index)
-		selectmenuitem ('Evolution-Mail', 'mnuTools;mnuCreateFilterFromMessage;mnuFilteronSubject')
-		settextvalue('dlgAddFilterRule', 'txtRuleName', filter_name)
-		click ('dlgAddFilterRule', 'btn<clickheretoselectafolder>')
-		click ('dlgSelectFolder', 'btnNew')
-		settextvalue('dlgCreateNewFolder', 'txtFoldername', folder_name)
-		selectrow ('dlgCreateNewFolder', 'treetblMailFolderTree', account_name)
-		click ('dlgCreateNewFolder', 'btnCreate')
-		selectrow ('dlgSelectFolder', 'treetblMailFolderTree', folder_name)
-		click ('dlgSelectFolder', 'btnOK')
-		click ('dlgAddFilterRule', 'btnOK')
-		log ('Create Filter from Message on Subject', 'pass')
-	except:
-		log ('Create Filter from Message on Subject', 'fail')
-
-#Verify Filter
-def verify_filter (index, folder_name):
-	try:
-		selectrow ('Evolution-Mail', 'treeTabFolder', 'Mailbox')
-		filter_mail_count = 0
-		subject = getcellvalue ('Evolution-Mail', 'treetblMails', index, 4)
-		total_mail_count = getrowcount ('Evolution-Mail', 'treetblMails')
-		for i in range (0, total_mail_count):
-			temp_subject = getcellvalue ('Evolution-Mail', 'treetblMails', i, 4)
-			if (string.find (temp_subject, subject) >= 0):
-				filter_mail_count = filter_mail_count + 1
-		selectmenuitem ('Evolution-Mail', 'mnuEdit;mnuSelectAll')
-		selectmenuitem ('Evolution-Mail', 'mnuActions;mnuApplyFilters')
-		time.sleep (2)
-		selectrow ('Evolution-Mail', 'treeTabFolder', folder_name)
-		time.sleep (2)
-		folder_mail_count = getrowcount ('Evolution-Mail', 'treetblMails')
-		selectmenuitem ('Evolution-Mail', 'mnuTools;mnuFilters')
-		selectrowindex ('dlgFilters', 'tblFilterRules', 0)
-		click ('dlgFilters', 'btnRemove')
-		click ('dlgFilters', 'btnOK')
-		if (filter_mail_count == folder_mail_count):
-			log ('Verify Filter from Message Subject', 'pass')
-		else:
-			log ('Verify Filter from Message Subject', 'fail')
-	except:
-		log ('Verify Filter from Message Subject', 'fail')
-
-#Getting the data from a file				
-file = open('filter_message_on_subject.dat', 'r')
-argmts = file.readlines()
-index = int (argmts[1].strip( ))
-account_name = argmts[2].strip( )
-filter_name = argmts[3].strip( )
-folder_name = argmts[4].strip( )
-
-#Calling the functions
-log ('Create and Verify Filter from Message on Subject', 'teststart')
-log ('Create Filter from Message on Subject', 'teststart')
-create_filter(index, filter_name, folder_name, account_name)
-log ('Create Filter from Message on Subject', 'testend')
-log ('Verify Filter from Message on Subject', 'teststart')
-verify_filter (index, folder_name)
-log ('Verify Filter from Message on Subject', 'testend')
-log ('Create and Verify Filter from Message on Subject', 'testend')
-
diff --git a/evolution/filter_message_on_mailinglist.dat b/evolution/filter_message_on_mailinglist.dat
deleted file mode 100644
index a0d6b8d..0000000
--- a/evolution/filter_message_on_mailinglist.dat
+++ /dev/null
@@ -1,5 +0,0 @@
-junk	
-1
-ldtp@scooby.net
-filter on mailing list	
-mailing list
diff --git a/evolution/filter_message_on_recipients.dat b/evolution/filter_message_on_recipients.dat
deleted file mode 100644
index 197ca52..0000000
--- a/evolution/filter_message_on_recipients.dat
+++ /dev/null
@@ -1,6 +0,0 @@
-junk
-1
-ldtp@scooby.net
-filter on recipients
-recipients
-ldtp@scooby.net
diff --git a/evolution/filter_message_on_sender.dat b/evolution/filter_message_on_sender.dat
deleted file mode 100644
index f5d630b..0000000
--- a/evolution/filter_message_on_sender.dat
+++ /dev/null
@@ -1,5 +0,0 @@
-junk
-1
-ldtp@scooby.net
-filter on sender
-sender
diff --git a/evolution/filter_message_on_subject.dat b/evolution/filter_message_on_subject.dat
deleted file mode 100644
index 94a2d87..0000000
--- a/evolution/filter_message_on_subject.dat
+++ /dev/null
@@ -1,5 +0,0 @@
-junk
-1
-ldtp@scooby.net
-filter on subject
-subject
diff --git a/evolution/filter_search.dat b/evolution/filter_search.dat
deleted file mode 100644
index 5ad323a..0000000
--- a/evolution/filter_search.dat
+++ /dev/null
@@ -1,4 +0,0 @@
-junk
-Body contains
-test
-
diff --git a/evolution/filter_search_on_recipients.dat b/evolution/filter_search_on_recipients.dat
deleted file mode 100644
index cfef518..0000000
--- a/evolution/filter_search_on_recipients.dat
+++ /dev/null
@@ -1,3 +0,0 @@
-junk
-Mailbox
-val1
diff --git a/evolution/filter_search_on_recipients.py b/evolution/filter_search_on_recipients.py
deleted file mode 100644
index f5145fa..0000000
--- a/evolution/filter_search_on_recipients.py
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Khasim Shaheed <sshaik@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-
-#Filter Search and Verify Filter Search on Recipients contains
-import string, time
-
-#Filter search
-def search (search_folder, data):
-	try:
-		click ('Evolution-Mail', 'tbtnMail')
-		time.sleep (2)
-		selectrow ('Evolution-Mail', 'treeTabFolder', search_folder)
-		global search_mail_count
-		search_mail_count = 0
-		total_mail_count = getrowcount ('Evolution-Mail', 'treetblMails')
-		check ('Evolution-Mail', 'mnuAsSentFolder')
-		for i in range (0, total_mail_count):
-			recipient = getcellvalue ('Evolution-Mail', 'treetblMails', i, 3)
-			if (string.find (recipient, data) >= 0):
-				search_mail_count = search_mail_count + 1
-		check ('Evolution-Mail', 'mnuMessages')
-		comboselect ('Evolution-Mail', 'cmbSearchType', 'Recipients contain')
-		if (data):
-			settextvalue ('Evolution-Mail', 'txtSearchTextEntry', data)
-		click ('Evolution-Mail', 'btnFindNow')
-		time.sleep (2)
-		log('Filter Search on Recipients contains' ,'pass')
-	except:
-		log('Filter Search on Recipients contains' ,'fail')
-
-#Verify filter search
-def verify_search (search_mail_count):
-	try:
-		filter_mail_count = getrowcount ('Evolution-Mail', 'treetblMails')
-		if (search_mail_count == filter_mail_count):
-			log ('Verify Filter Search on Recipients contains', 'pass')
-		else:
-			log ('Verify Filter Search on Recipients contains', 'fail')
-		click ('Evolution-Mail', 'btnClear')
-        except:
-		log ('Verify Filter Search on Recipients contains', 'fail')
-
-#Getting the data from a file		
-file = open('filter_search_on_recipients.dat', 'r')
-argmts = file.readlines()
-search_folder = argmts[1].strip( )
-data = argmts[2].strip( )
-
-#Calling the functions
-log('Filter Search and Verify Filter Search on Recipients contains', 'teststart')
-log('Filter Search on Recipients contains', 'teststart')
-search (search_folder, data)
-log('Filter Search on Recipients contains', 'testend')
-log('Verification of Filter Search on Recipients contains', 'teststart')
-verify_search (search_mail_count)
-log('Verification of Filter Search on Recipients contains', 'testend')
-log('Filter Search and Verify Filter Search on Recipients contains', 'testend')
diff --git a/evolution/filter_search_on_sender.dat b/evolution/filter_search_on_sender.dat
deleted file mode 100644
index cfef518..0000000
--- a/evolution/filter_search_on_sender.dat
+++ /dev/null
@@ -1,3 +0,0 @@
-junk
-Mailbox
-val1
diff --git a/evolution/filter_search_on_sender.py b/evolution/filter_search_on_sender.py
deleted file mode 100644
index cdaffdf..0000000
--- a/evolution/filter_search_on_sender.py
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Khasim Shaheed <sshaik@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-
-#Filter Search and Verify Filter Search on Sender contains
-import string, time
-
-#Filter search
-def search (search_folder, data):
-	try:
-		click ('Evolution-Mail', 'tbtnMail')
-		time.sleep (2)
-		selectrow ('Evolution-Mail', 'treeTabFolder', search_folder)
-		global search_mail_count
-		search_mail_count = 0
-		total_mail_count = getrowcount ('Evolution-Mail', 'treetblMails')
-		for i in range (0, total_mail_count):
-			sender = getcellvalue ('Evolution-Mail', 'treetblMails', i, 3)
-			if (string.find (sender, data) >= 0):
-				search_mail_count = search_mail_count + 1
-		comboselect ('Evolution-Mail', 'cmbSearchType', 'Sender contains')
-		if (data):
-			settextvalue ('Evolution-Mail', 'txtSearchTextEntry', data)
-		click ('Evolution-Mail', 'btnFindNow')
-		time.sleep (2)
-		log('Filter Search on Sender contains' ,'pass')
-	except:
-		log('Filter Search on Sender contains' ,'fail')
-
-#Verify filter search
-def verify_search (search_mail_count):
-	try:
-		filter_mail_count = getrowcount ('Evolution-Mail', 'treetblMails')
-		if (search_mail_count == filter_mail_count):
-			log ('Verify Filter Search on Sender contains', 'pass')
-		else:
-			log ('Verify Filter Search on Sender contains', 'fail')
-		click ('Evolution-Mail', 'btnClear')
-        except:
-		log ('Verify Filter Search on Sender contains', 'fail')
-
-#Getting the data from a file		
-file = open('filter_search_on_sender.dat', 'r')
-argmts = file.readlines()
-search_folder = argmts[1].strip( )
-data = argmts[2].strip( )
-
-#Calling the functions
-log('Filter Search and Verify Filter Search on Sender contains','teststart')
-log('Filter Search on Sender contains' ,'teststart')
-search (search_folder, data)
-log('Filter Search on Sender contains' ,'testend')
-log('Verification of Filter Search on Sender contains', 'teststart')
-verify_search (search_mail_count)
-log('Verification of Filter Search on Sender contains' ,'testend')
-log('Filter Search and Verify Filter Search on Sender contains','testend')
diff --git a/evolution/filter_search_on_subject.dat b/evolution/filter_search_on_subject.dat
deleted file mode 100644
index f299b99..0000000
--- a/evolution/filter_search_on_subject.dat
+++ /dev/null
@@ -1,3 +0,0 @@
-junk
-Mailbox
-test
diff --git a/evolution/filter_search_on_subject.py b/evolution/filter_search_on_subject.py
deleted file mode 100644
index 45df430..0000000
--- a/evolution/filter_search_on_subject.py
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Khasim Shaheed <sshaik@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-
-#Filter Search and Verify Filter Search on Subject contains
-import string, time
-
-#Filter search
-def search (search_folder, data):
-	try:
-		click ('Evolution-Mail', 'tbtnMail')
-		time.sleep (2)
-		selectrow ('Evolution-Mail', 'treeTabFolder', search_folder)
-		global search_mail_count
-		search_mail_count = 0
-		total_mail_count = getrowcount ('Evolution-Mail', 'treetblMails')
-		for i in range (0, total_mail_count):
-			subject = getcellvalue ('Evolution-Mail', 'treetblMails', i, 4)
-			if (string.find (subject, data) >= 0):
-				search_mail_count = search_mail_count + 1
-		comboselect ('Evolution-Mail', 'cmbSearchType', 'Subject contains')
-		if (data):
-			settextvalue ('Evolution-Mail', 'txtSearchTextEntry', data)
-		click ('Evolution-Mail', 'btnFindNow')
-		time.sleep (2)
-		log('Filter Search on Subject contains' ,'pass')
-	except:
-		log('Filter Search on Subject contains' ,'fail')
-
-#Verify filter search
-def verify_search (search_mail_count):
-	try:
-		filter_mail_count = getrowcount ('Evolution-Mail', 'treetblMails')
-		if (search_mail_count == filter_mail_count):
-			log ('Verify Filter Search on Subject contains', 'pass')
-		else:
-			log ('Verify Filter Search on Subject contains', 'fail')
-		click ('Evolution-Mail', 'btnClear')
-        except:
-		log ('Verify Filter Search on Subject contains', 'fail')
-
-#Getting the data from a file		
-file = open('filter_search_on_subject.dat', 'r')
-argmts = file.readlines()
-search_folder = argmts[1].strip( )
-data = argmts[2].strip( )
-
-#Calling the functions
-log('Filter Search and Verify Filter Search on Subject contains','teststart')
-log('Filter Search on Subject contains' ,'teststart')
-search (search_folder, data)
-log('Filter Search on Subject contains' ,'testend')
-log('Verification of Filter Search on Subject contains', 'teststart')
-verify_search (search_mail_count)
-log('Verification of Filter Search on Subject contains' ,'testend')
-log('Filter Search and Verify Filter Search on Subject contains','testend')
diff --git a/evolution/filter_search_on_subject_sender.dat b/evolution/filter_search_on_subject_sender.dat
deleted file mode 100644
index f299b99..0000000
--- a/evolution/filter_search_on_subject_sender.dat
+++ /dev/null
@@ -1,3 +0,0 @@
-junk
-Mailbox
-test
diff --git a/evolution/filter_search_on_subject_sender.py b/evolution/filter_search_on_subject_sender.py
deleted file mode 100644
index 076dd0e..0000000
--- a/evolution/filter_search_on_subject_sender.py
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Khasim Shaheed <sshaik@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-
-#Filter Search and Verify Filter Search on Subject or Sender contains
-import string, time
-
-#Filter search
-def search (search_folder, data):
-	try:
-		click ('Evolution-Mail', 'tbtnMail')
-		time.sleep (2)
-		selectrow ('Evolution-Mail', 'treeTabFolder', search_folder)
-		global search_mail_count
-		search_mail_count = 0
-		total_mail_count = getrowcount ('Evolution-Mail', 'treetblMails')
-		for i in range (0, total_mail_count):
-			subject = getcellvalue ('Evolution-Mail', 'treetblMails', i, 4)
-			sender = getcellvalue ('Evolution-Mail', 'treetblMails', i, 3)
-			if (string.find (subject, data) >= 0 or string.find (sender, data) >= 0):
-				search_mail_count = search_mail_count + 1
-		comboselect ('Evolution-Mail', 'cmbSearchType', 'Subject or Sender contains')
-		if (data):
-			settextvalue ('Evolution-Mail', 'txtSearchTextEntry', data)
-		click ('Evolution-Mail', 'btnFindNow')
-		time.sleep (2)
-		log('Filter Search on Subject or Sender contains' ,'pass')
-	except:
-		log('Filter Search on Subject or Sender contains' ,'fail')
-
-#Verify filter search
-def verify_search (search_mail_count):
-	try:
-		filter_mail_count = getrowcount ('Evolution-Mail', 'treetblMails')
-		if (search_mail_count == filter_mail_count):
-			log ('Verify Filter Search on Subject or Sender contains', 'pass')
-		else:
-			log ('Verify Filter Search on Subject or Sender contains', 'fail')
-		click ('Evolution-Mail', 'btnClear')
-        except:
-		log ('Verify Filter Search on Subject or Sender contains', 'fail')
-
-#Getting the data from a file		
-file = open('filter_search_on_subject_sender.dat', 'r')
-argmts = file.readlines()
-search_folder = argmts[1].strip( )
-data = argmts[2].strip( )
-
-#Calling the functions
-log('Filter Search and Verify Filter Search on Subject or Sender contains','teststart')
-log('Filter Search on Subject or Sender contains' ,'teststart')
-search (search_folder, data)
-log('Filter Search on Subject or Sender contains' ,'testend')
-log('Verification of Filter Search on Subject or Sender contains', 'teststart')
-verify_search (search_mail_count)
-log('Verification of Filter Search on Subject or Sender contains' ,'testend')
-log('Filter Search and Verify Filter Search on Subject or Sender contains','testend')
diff --git a/evolution/forward-mail.dat b/evolution/forward-mail.dat
deleted file mode 100644
index 7bed135..0000000
--- a/evolution/forward-mail.dat
+++ /dev/null
@@ -1,6 +0,0 @@
-nags@dell.net
-$
-$
-$
-$
-$
diff --git a/evolution/forward-mail.py b/evolution/forward-mail.py
deleted file mode 100644
index af71e9c..0000000
--- a/evolution/forward-mail.py
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/usr/bin/python
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Nagashree <mnagashree@novell.com>
-#     Premkumar <jpremkumar@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-
-# To Forward a Mail using args supplied by a text file
-from evoutils.mail import *
-
-#To Forward mail
-def forward_mail (source_fldr, mail_index,  to, body, subject_new='', cc=''):
-	try:
-		time.sleep (3)
-		selectmenuitem ('evolution', 'mnuView;mnuWindow;mnuMail')
-		time.sleep (3)
-		time.sleep (10)
-		selectrowpartialmatch ('evolution', 'ttblMailFolderTree', source_fldr)
-		if mail_index == -1:
-			mail_index = getrowcount ('evolution', 'ttblMessageList') - 1
-		
-		selectrowindex ('evolution', 'ttblMessageList', mail_index)
-
-		subject = getcellvalue ('evolution', 'ttblMessageList', mail_index, 4)
-		click ('evolution','btnForward')
-		time.sleep(3)
-		setcontext ('Compose a message', '[Fwd: '+subject+']')
-		if guiexist ('Composeamessage') == 0:
-			log ('Failed to open forward frame', 'error')
-			raise LdtpExecutionError(0)
-		else:
-			if populate_mail_header (to, subject_new, body, cc) == 0:
-				log ('Failed to populate mail header',
-				     'error')
-				raise LdtpExecutionError (0)
-			else:
-				click ('Composeamessage', 'btnSend')
-				if guiexist ('Composeamessage') == 0:
-					log ('Failed to close Compose dialog after sending','error')
-					raise LdtpExecutionError(0)
-				else:
-					click('evolution', 'btnSend/Receive')
-					log('Forward-message-Success', 'pass')
-					releasecontext()
-	except error:
-		print 'Forward messsage Failed'
-		log ('Forward-Mail-Failed', 'fail')
-
-#Trying to read from the file
-inpfile = open('forward-mail.dat', 'r')
-argmts = inpfile.readlines ()
-to_mailid = argmts[0].strip ()
-Bodytxt_Mail = argmts[1].strip ()
-if Bodytxt_Mail == '$':
-	Bodytxt_Mail = ''
-Subjecttxt = argmts[2].strip ()
-if Subjecttxt == '$':
-	Subjecttxt = ''
-Cc_mailid = argmts[3].strip ()
-if Cc_mailid == '$':
-	Cc_mailid = ''
-source_fldr = argmts[4].strip ()
-if source_fldr == '$':
-	source_fldr = 'Inbox'
-mail_index = argmts[5].strip ()
-if mail_index == '$':
-	mail_index = -1
-
-# Call the function
-log ('Forward Mail' , 'teststart')
-forward_mail (source_fldr, mail_index, to_mailid, Bodytxt_Mail, Subjecttxt, Cc_mailid)
-log ('Forward Mail', 'testend')
-log ('Forward Mail - Verification', 'teststart')
-verifymailwithimage ('Sent Items', -9, 'forwardmail_refimage.png')
-log ('Forward Mail - Verification', 'testend')
-
diff --git a/evolution/forwardmail_refimg.png b/evolution/forwardmail_refimg.png
deleted file mode 100644
index 84d46f1..0000000
--- a/evolution/forwardmail_refimg.png
+++ /dev/null
diff --git a/evolution/move_mails.dat b/evolution/move_mails.dat
deleted file mode 100644
index 69e5dd0..0000000
--- a/evolution/move_mails.dat
+++ /dev/null
@@ -1,5 +0,0 @@
-junk
-Mailbox
-test
-2
-3
diff --git a/evolution/move_mails.py b/evolution/move_mails.py
deleted file mode 100644
index ea54731..0000000
--- a/evolution/move_mails.py
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Khasim Shaheed <sshaik@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-
-#Move And Verify Move of Mails
-import time
-
-#Move mails
-def move (source, destination, start, end):
-	try:
-		for i in range(start, end+1):
-			selectrowindex ('Evolution-Mail', 'treetblMails', start)
-			click ('Evolution-Mail', 'btnMove')
-			selectrow ('dlgSelectFolder', 'treetblMails', destination)
-			click ('dlgSelectFolder', 'btnMove')
-		log ('Move Mails', 'pass')
-	except:
-		log ('Move Mails', 'fail')
-
-#Verify moving of mails
-def verify_move (source, destination, no_mails, prev_scount, prev_dcount):
-	try:
-		click ('Evolution-Mail', 'tbtnMail')
-		time.sleep (2)
-		selectrow ('Evolution-Mail', 'treeTabFolder', destination)
-		new_dcount = getrowcount ('Evolution-Mail', 'treetblMails')
-                selectrow ('Evolution-Mail', 'treeTabFolder', source)
-		new_scount = getrowcount ('Evolution-Mail', 'treetblMails')
-		if (new_scount == (prev_scount-no_mails) and new_dcount == (prev_dcount+no_mails)):
-			log ('Verify Move Mails', 'pass')
-	        else:
-			log ('Verify Move Mails', 'fail')
-        except:
-		log ('Verify Move Mails', 'fail')
-
-#Getting the data from a file		
-file = open('move_mails.dat', 'r')
-argmts = file.readlines()
-source = argmts[1].strip( )
-destination = argmts[2].strip( )
-start = int (argmts[3].strip( ))
-end = int (argmts[4].strip( ))
-
-#Calling the functions and getting the initial
-#message count of source and destination folders
-log('Move And Verify Moving of Mails', 'teststart')
-log('Move Mails' ,'teststart')
-click ('Evolution-Mail', 'tbtnMail')
-time.sleep (2)
-selectrow ('Evolution-Mail', 'treeTabFolder', destination)
-time.sleep (1)
-prev_dcount = getrowcount ('Evolution-Mail', 'treetblMails')
-selectrow ('Evolution-Mail', 'treeTabFolder', source)
-time.sleep (1)
-prev_scount = getrowcount ('Evolution-Mail', 'treetblMails')
-move (source, destination, start, end)
-log('Move Mails' ,'testend')
-log('Verification of Move Mails', 'teststart')
-no_mails = end-start+1
-verify_move (source, destination, no_mails, prev_scount, prev_dcount)
-log('Verification of Move Mails' ,'testend')
-log('Move Mails and Verify Moveing of Mails','testend')
diff --git a/evolution/move_mails_new_folder.dat b/evolution/move_mails_new_folder.dat
deleted file mode 100644
index fa28720..0000000
--- a/evolution/move_mails_new_folder.dat
+++ /dev/null
@@ -1,6 +0,0 @@
-junk
-Mailbox
-dump
-ldtp@scooby.net
-2
-3
diff --git a/evolution/move_mails_new_folder.py b/evolution/move_mails_new_folder.py
deleted file mode 100644
index 2aeb87a..0000000
--- a/evolution/move_mails_new_folder.py
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Khasim Shaheed <sshaik@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-
-#Move And Verify Move of Mails
-import time
-
-#Move mails
-def move (source, destination, account_name, start, end):
-	try:
-		selectrowindex ('Evolution-Mail', 'treetblMails', start)
-                click ('Evolution-Mail', 'btnMove')
-                click ('dlgSelectFolder', 'btnNew')
-                settextvalue ('dlgCreateNewFolder', 'txtFoldername', destination)
-                selectrow ('dlgCreateNewFolder', 'treetblMailFolderTree', account_name)
-                click ('dlgCreateNewFolder', 'btnCreate')
-                selectrow ('dlgSelectFolder', 'treetblMails', destination)
-                click ('dlgSelectFolder', 'btnMove')
-		for i in range(start+1, end+1):
-			selectrowindex ('Evolution-Mail', 'treetblMails', start)
-			click ('Evolution-Mail', 'btnMove')
-			selectrow ('dlgSelectFolder', 'treetblMails', destination)
-			click ('dlgSelectFolder', 'btnMove')
-		log ('Move Mails', 'pass')
-	except:
-		log ('Move Mails', 'fail')
-
-#Verify moving of mails
-def verify_move (source, destination, no_mails, prev_scount):
-	try:
-		click ('Evolution-Mail', 'tbtnMail')
-		time.sleep (2)
-		selectrow ('Evolution-Mail', 'treeTabFolder', destination)
-		new_dcount = getrowcount ('Evolution-Mail', 'treetblMails')
-                selectrow ('Evolution-Mail', 'treeTabFolder', source)
-		new_scount = getrowcount ('Evolution-Mail', 'treetblMails')
-		if (new_scount == (prev_scount-no_mails) and new_dcount == no_mails):
-			log ('Verify Move Mails', 'pass')
-	        else:
-			log ('Verify Move Mails', 'fail')
-        except:
-		log ('Verify Move Mails', 'fail')
-
-#Getting the data from a file		
-file = open('move_mails_new_folder.dat', 'r')
-argmts = file.readlines()
-source = argmts[1].strip( )
-destination = argmts[2].strip( )
-account_name = argmts[3].strip( )
-start = int (argmts[4].strip( ))
-end = int (argmts[5].strip( ))
-
-#Calling the functions and getting the initial
-#message count of source and destination folders
-log('Move And Verify Moving of Mails', 'teststart')
-log('Move Mails' ,'teststart')
-click ('Evolution-Mail', 'tbtnMail')
-time.sleep (2)
-selectrow ('Evolution-Mail', 'treeTabFolder', source)
-time.sleep (1)
-prev_scount = getrowcount ('Evolution-Mail', 'treetblMails')
-move (source, destination, account_name, start, end)
-log('Move Mails' ,'testend')
-log('Verification of Move Mails', 'teststart')
-no_mails = end-start+1
-verify_move (source, destination, no_mails, prev_scount)
-log('Verification of Move Mails' ,'testend')
-log('Move Mails and Verify Moveing of Mails','testend')
diff --git a/evolution/movemail.dat b/evolution/movemail.dat
deleted file mode 100644
index 83b433d..0000000
--- a/evolution/movemail.dat
+++ /dev/null
@@ -1,3 +0,0 @@
-Inbox
-bugs
-$
\ No newline at end of file
diff --git a/evolution/movemail.py b/evolution/movemail.py
deleted file mode 100644
index f93e4e3..0000000
--- a/evolution/movemail.py
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/python
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Nagashree <mnagashree@novell.com>
-#     Premkumar <jpremkumar@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-
-#Moving an existing Mail
-
-# Section to select and move mail
-def move_mail (from_fldr, to_fldr, mail_index):
-	try:
-		time.sleep (10)
-		selectrowpartialmatch ('evolution', 'ttblMailFolderTree', to_fldr)
-		time.sleep (2)
-		row_before = getrowcount('evolution', 'ttblMessageList')
-		time.sleep (2)
-		selectrowpartialmatch ('evolution', 'ttblMailFolderTree', from_fldr)
-		time.sleep (2)
-		rowcount = getrowcount('evolution', 'ttblMessageList') 
-		if rowcount > 0:
-			if mail_index == -1:
-				mail_index = rowcount - 1
-			selectrowindex ('evolution', 'ttblMessageList', mail_index)
-			selectmenuitem ('evolution', 'mnuMessage;mnuMoveToFolder')
-			selectrowpartialmatch ('dlgSelectfolder', 'ttblMailFolderTree',to_fldr )
-			click ('dlgSelectfolder', 'btnMove')
-			time.sleep (3)
-			if guiexist('dlgSelectfolder') == 1:
-				log ('Select folder dialog not closed', 'error')
-				raise LdtpExecutionError(0)
-			else:
-				selectrowpartialmatch ('evolution', 'ttblMailFolderTree',to_fldr)
-				time.sleep (5)
-				row_after = getrowcount ('evolution', 'ttblMessageList')
-				selectmenuitem ('evolution', 'mnuFile;mnuClose')
-				time.sleep(3)
-				if row_after > row_before:
-					log ('Moving a mail passed successfully', 'pass') 
-				else:
-					log ('Moving a mail failed', 'fail')
-		else:
-			log ('From folder empty!', 'Warning')
-			log ('Did not move any mails to other folder', 'Pass')
-	except ldtp.error,msg:
-		print 'Moving mail between folders failed', str(msg)
-		log ('Moving mail failed', 'fail')
-			
-#Read input from file
-file = open ('movemail.dat', 'r')
-argmts = file.readlines()
-from_fldr = argmts[0].strip ()
-to_fldr = argmts[1].strip ()
-mail_index = argmts[2].strip ()
-
-if mail_index == '$':
-	mail_index = -1;
-
-# Call the function
-log ('Move mail', 'teststart')	
-move_mail (from_fldr, to_fldr, mail_index)
-log ('Move mail', 'testend')
-
-                                                                           
diff --git a/evolution/reply-mail.dat b/evolution/reply-mail.dat
deleted file mode 100644
index bb417cc..0000000
--- a/evolution/reply-mail.dat
+++ /dev/null
@@ -1,4 +0,0 @@
-thanks for the mail
-nags@dell.net
-$
-$
\ No newline at end of file
diff --git a/evolution/reply-mail.py b/evolution/reply-mail.py
deleted file mode 100644
index 88e86d6..0000000
--- a/evolution/reply-mail.py
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/bin/python
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Bhargavi  <kbhargavi_83@yahoo.co.in>
-#     Premkumar <jpremkumar@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-
-# To Reply a Mail using args supplied by a text file
-
-#To reply mail
-def reply_mail (source_fldr, mail_index, body, cc=''):
-	try:
-		time.sleep (3)
-		selectmenuitem('evolution','mnuView;mnuWindow;mnuMail')
-		time.sleep (15)
-
-		selectrowpartialmatch ('evolution', 'ttblMailFolderTree', source_fldr)
-		time.sleep (3)
-		if mail_index == -1:
-			mail_index = getrowcount ('evolution', 'ttblMessageList') - 1
-		selectrowindex ('evolution', 'ttblMessageList', mail_index)
-		subject = getcellvalue ('evolution', 'ttblMessageList', mail_index, 4)
-		click ('evolution', 'btnReply')
-		time.sleep (3)
-		if subject.startswith ('Re:') == False:
-			setcontext ('Compose a message', 'Re: '+subject)
-		else:
-			setcontext ('Compose a message', subject)
-		time.sleep (5)
-		if guiexist ('Composeamessage') == 0:
-			log ('Failed to open reply frame', 'error')
-			raise LdtpExecutionError (0)
-		else:
-			new_context = 'Re: '+subject
-			if cc!='' and setandverify ('Composeamessage', 'txtCc', cc) == 0:
-				log ('Failed to insert into Cc field', 'error')
-				raise LdtpExecutionError (0)
-			else:
-				if setandverify ('Composeamessage', 'txt6', body) == 0:
-					log ('Failed to insert body text', 'error')
-					raise LdtpExecutionError (0)
-				else:
-					click ('Composeamessage', 'btnSend')
-					time.sleep (5)
-					if guiexist ('Composeamessage') == 1:
-						log ('Failed to close Compose dialog after sending', 'error')
-						raise LdtpExecutionError (0)
-					else:
-						click ('evolution', 'btnSend/Receive')
-						time.sleep (3)
-						log ('Reply-message-Success', 'pass')
-	except error:
-		releasecontext ()
-		print 'Reply messsage Failed'
-		log('Reply-Mail-Failed','fail')
-
-#Trying to read from the file
-file = open('reply-mail.dat', 'r')
-argmts = file.readlines ()
-Bodytxt_Mail = argmts[0].strip ()
-Cc_mailid = argmts[1].strip ()
-source_fldr = argmts[2].strip ()
-mail_index = argmts[3].strip ()
-
-if source_fldr == '$':
-	source_fldr = 'Inbox'
-if mail_index == '$':
-	mail_index = -1
-
-# Call the function
-
-log('Reply and Verification of Mail','teststart')
-log('Reply Mail', 'teststart')
-reply_mail (source_fldr, mail_index, Bodytxt_Mail, Cc_mailid)
-log('Reply Mail','testend')
-log('Reply Mail - Verification', 'teststart')
-verifymailwithimage ('Sent Items', -1,'replymail_refimg.png')
-log('Reply Mail - Verification', 'testend')
-log('ReplyandVerificationofMail', 'testend')
diff --git a/evolution/replymail_refimg.png b/evolution/replymail_refimg.png
deleted file mode 100644
index 3cf3252..0000000
--- a/evolution/replymail_refimg.png
+++ /dev/null
diff --git a/evolution/save_as_draft.py b/evolution/save_as_draft.py
deleted file mode 100644
index 193f95a..0000000
--- a/evolution/save_as_draft.py
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Khasim Shaheed <sshaik@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-
-# Save a mail as draft and verify
-import time
-
-# Save a message as draft
-def save_draft (to_address, cc_address, msg_subject, msg_body):
-	try:
-		selectmenuitem ('Evolution-Mail', 'mnuFile;mnuNew;mnuMailMessage')
-		time.sleep (1)
-	        check ('frmComposeamessage', 'mnuCcField')
-		settextvalue ('frmComposeamessage', 'txtTo', to_address)
-		settextvalue ('frmComposeamessage', 'txtCc', cc_address)
-		settextvalue ('frmComposeamessage', 'txtSubject', msg_subject)
-		setcontext ('Compose a message', msg_subject)
-		settextvalue ('frmComposeamessage', 'txtMailBody', msg_body)
-		selectmenuitem ('frmComposeamessage', 'mnuFile;mnuSave')
-		selectmenuitem ('frmComposeamessage', 'mnuFile;mnuClose')
-		log ('Saving a draft', 'pass')
-	except:
-		log ('Saving a draft', 'fail')			
-
-#Verify saved draft
-def verify_draft (draft_folder, to_address, cc_address, msg_subject, msg_body):
-	try:
-		selectrow ('Evolution-Mail', 'treeTabFolder', draft_folder)
-		time.sleep (3)
-		selectlastrow ('Evolution-Mail', 'treetblMails')
-                selectmenuitem ('Evolution-Mail', 'mnuFile;mnuOpenMessage')
-                setcontext('Compose a message', msg_subject)
-                verifysettext ('frmComposeamessage', 'txtTo', to_address)
-                verifysettext ('frmComposeamessage', 'txtCc', cc_address)
-                verifysettext ('frmComposeamessage', 'txtSubject', msg_subject)
-                selectmenuitem ('frmComposeamessage', 'mnuFile;mnuClose')
-                log ('Verify saved draft', 'pass')
-        except:
-                log ('Verify saved draft', 'fail')
-
-#Getting the data
-file = open('save_draft.dat', 'r')
-argmts = file.readlines()
-draft_folder = argmts[1].strip( )
-to_address = argmts[2].strip( )
-cc_address = argmts[3].strip( )
-msg_subject = argmts[4].strip( )
-msg_body = argmts[5].strip( )
-
-
-#Calling the functions
-log ('Save and Verify saved draft', 'teststart')
-log ('Save a message as draft', 'teststart')
-save_draft (to_address, cc_address, msg_subject, msg_body)
-log ('Save a message as draft', 'testend')
-log ('Verify saved draft', 'tesstart')
-verify_draft (draft_folder, to_address, cc_address, msg_subject, msg_body)
-log ('Verify saved draft', 'testend')
-log ('Change and Verify saved draft', 'testend')
-
diff --git a/evolution/save_draft.dat b/evolution/save_draft.dat
deleted file mode 100644
index 40d92b2..0000000
--- a/evolution/save_draft.dat
+++ /dev/null
@@ -1,7 +0,0 @@
-junk
-Drafts
-khasim@scooby.net
-shaheed@scooby.net
-hello
-test mail to test saving as draft
-
diff --git a/evolution/vFolder_from_message_mailinglist.py b/evolution/vFolder_from_message_mailinglist.py
deleted file mode 100644
index 630f408..0000000
--- a/evolution/vFolder_from_message_mailinglist.py
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Khasim Shaheed <sshaik@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-
-#Create and Verify vFolder from Message on MailingList
-import string, import
-
-#Create vFolder
-def create_vFolder (index, vFolder_name):
-	try:
-		click ('Evolution-Mail', 'tbtnMail')
-		time.sleep (2)
-		selectrow ('Evolution-Mail', 'treeTabFolder', 'Mailbox')
-		selectrowindex ('Evolution-Mail', 'treetblMails', index)
-		selectmenuitem ('Evolution-Mail', 'mnuTools;mnuCreatevFolderFromMessage;mnuvFolderonMailingList')
-		settextvalue('dlgNewvFolder', 'txtRuleName', vFolder_name)
-		click ('dlgNewvFolder', 'btnOK')
-		log ('Create vFolder from Message on MailingList', 'pass')
-	except:
-		log ('Create vFolder from Message on MailingList', 'fail')
-
-#Verify vFolder
-def verify_vFolder (index, folder_name):
-	try:
-		selectrow ('Evolution-Mail', 'treeTabFolder', 'Mailbox')
-		vFolder_mail_count = 0
-		mailinglist = getcellvalue ('Evolution-Mail', 'treetblMails', index, 3)
-		total_mail_count = getrowcount ('Evolution-Mail', 'treetblMails')
-		for i in range (0, total_mail_count):
-			temp_mailinglist = getcellvalue ('Evolution-Mail', 'treetblMails', i, 3)
-			if (string.find (temp_mailinglist, mailinglist) >= 0):
-				vFolder_mail_count = vFolder_mail_count + 1
-		selectrow ('Evolution-Mail', 'treeTabFolder', folder_name)
-		time.sleep (2)
-		folder_mail_count = getrowcount ('Evolution-Mail', 'treetblMails')
-		if (vFolder_mail_count == folder_mail_count):
-			log ('Verify vFolder from Message MailingList', 'pass')
-		else:
-			log ('Verify vFolder from Message MailingList', 'fail')
-	except:
-		log ('Verify vFolder from Message MailingList', 'fail')
-
-#Getting the data from a file				
-file = open('vFolder_message_on_mailinglist.dat', 'r')
-argmts = file.readlines()
-index = int (argmts[1].strip( ))
-vFolder_name = argmts[2].strip( )
-
-#Calling the functions
-log ('Create and Verify vFolder from Message on MailingList', 'teststart')
-log ('Create vFolder from Message on MailingList', 'teststart')
-create_vFolder(index, vFolder_name)
-log ('Create vFolder from Message on MailingList', 'testend')
-log ('Verify vFolder from Message on MailingList', 'teststart')
-verify_vFolder (index, vFolder_name)
-log ('Verify vFolder from Message on MailingList', 'testend')
-log ('Create and Verify vFolder from Message on MailingList', 'testend')
-
diff --git a/evolution/vFolder_from_message_recipients.py b/evolution/vFolder_from_message_recipients.py
deleted file mode 100644
index 44402f9..0000000
--- a/evolution/vFolder_from_message_recipients.py
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Khasim Shaheed <sshaik@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-
-#Create and Verify vFolder from Message on Recipients
-import string, time
-
-#Create vFolder
-def create_vFolder (index, vFolder_name):
-	try:
-		click ('Evolution-Mail', 'tbtnMail')
-		time.sleep (2)
-		selectrow ('Evolution-Mail', 'treeTabFolder', 'Mailbox')
-		selectrowindex ('Evolution-Mail', 'treetblMails', index)
-		selectmenuitem ('Evolution-Mail', 'mnuTools;mnuCreatevFolderFromMessage;mnuvFolderonRecipients')
-		settextvalue('dlgNewvFolder', 'txtRuleName', vFolder_name)
-		click ('dlgNewvFolder', 'btnOK')
-		log ('Create vFolder from Message on Recipients', 'pass')
-		return recipient
-	except:
-		log ('Create vFolder from Message on Recipients', 'fail')
-
-#Verify vFolder
-def verify_vFolder (index, folder_name, recipient):
-	try:
-		selectrow ('Evolution-Mail', 'treeTabFolder', 'Mailbox')
-		vFolder_mail_count = 0
-		total_mail_count = getrowcount ('Evolution-Mail', 'treetblMails')
-		check ('Evolution-Mail', 'mnuAsSentFolder')
-                for i in range (0, total_mail_count):
-                        total_recipients = getcellvalue ('Evolution-Mail', 'treetblMails', i, 3)
-                        if (string.find (total_recipients, recipient) >= 0):
-                                vFolder_mail_count = vFolder_mail_count + 1
-                check ('Evolution-Mail', 'mnuMessages')
-		selectrow ('Evolution-Mail', 'treeTabFolder', folder_name)
-		time.sleep (2)
-		folder_mail_count = getrowcount ('Evolution-Mail', 'treetblMails')
-		if (vFolder_mail_count == folder_mail_count):
-			log ('Verify vFolder from Message Recipients', 'pass')
-		else:
-			log ('Verify vFolder from Message Recipients', 'fail')
-	except:
-		log ('Verify vFolder from Message Recipients', 'fail')
-				
-#Getting the data from a file
-file = open('vFolder_message_on_recipients.dat', 'r')
-argmts = file.readlines()
-index = int (argmts[1].strip( ))
-vFolder_name = argmts[2].strip( )
-recipient = argmts[3].strip( )
-
-#Calling the functions
-log ('Create and Verify vFolder from Message on Recipients', 'teststart')
-log ('Create vFolder from Message on Recipients', 'teststart')
-create_vFolder(index, vFolder_name)
-log ('Create vFolder from Message on Recipients', 'testend')
-log ('Verify vFolder from Message on Recipients', 'teststart')
-verify_vFolder (index, vFolder_name, recipient)
-log ('Verify vFolder from Message on Recipients', 'testend')
-log ('Create and Verify vFolder from Message on Recipients', 'testend')
-
diff --git a/evolution/vFolder_from_message_sender.py b/evolution/vFolder_from_message_sender.py
deleted file mode 100644
index 03487ec..0000000
--- a/evolution/vFolder_from_message_sender.py
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Khasim Shaheed <sshaik@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-
-#Create and Verify vFolder from Message on Sender
-import string, time
-
-#Create vFolder
-def create_vFolder (index, vFolder_name):
-	try:
-		click ('Evolution-Mail', 'tbtnMail')
-		time.sleep (2)
-		selectrow ('Evolution-Mail', 'treeTabFolder', 'Mailbox')
-		selectrowindex ('Evolution-Mail', 'treetblMails', index)
-		selectmenuitem ('Evolution-Mail', 'mnuTools;mnuCreatevFolderFromMessage;mnuvFolderonSender')
-		settextvalue('dlgNewvFolder', 'txtRuleName', vFolder_name)
-		click ('dlgNewvFolder', 'btnOK')
-		log ('Create vFolder from Message on Sender', 'pass')
-	except:
-		log ('Create vFolder from Message on Sender', 'fail')
-
-#Verify vFolder
-def verify_vFolder (index, folder_name):
-	try:
-		selectrow ('Evolution-Mail', 'treeTabFolder', 'Mailbox')
-		vFolder_mail_count = 0
-		sender = getcellvalue ('Evolution-Mail', 'treetblMails', index, 3)
-		total_mail_count = getrowcount ('Evolution-Mail', 'treetblMails')
-		for i in range (0, total_mail_count):
-			temp_sender = getcellvalue ('Evolution-Mail', 'treetblMails', i, 3)
-			if (string.find (temp_sender, sender) >= 0):
-				vFolder_mail_count = vFolder_mail_count + 1
-		selectrow ('Evolution-Mail', 'treeTabFolder', folder_name)
-		time.sleep (2)
-		folder_mail_count = getrowcount ('Evolution-Mail', 'treetblMails')
-		if (vFolder_mail_count == folder_mail_count):
-			log ('Verify vFolder from Message Sender', 'pass')
-		else:
-			log ('Verify vFolder from Message Sender', 'fail')
-	except:
-		log ('Verify vFolder from Message Sender', 'fail')
-
-#Getting the data from a file				
-file = open('vFolder_message_on_sender.dat', 'r')
-argmts = file.readlines()
-index = int (argmts[1].strip( ))
-vFolder_name = argmts[2].strip( )
-
-#Calling the functions
-log ('Create and Verify vFolder from Message on Sender', 'teststart')
-log ('Create vFolder from Message on Sender', 'teststart')
-create_vFolder(index, vFolder_name)
-log ('Create vFolder from Message on Sender', 'testend')
-log ('Verify vFolder from Message on Sender', 'teststart')
-verify_vFolder (index, vFolder_name)
-log ('Verify vFolder from Message on Sender', 'testend')
-log ('Create and Verify vFolder from Message on Sender', 'testend')
-
diff --git a/evolution/vFolder_from_message_subject.py b/evolution/vFolder_from_message_subject.py
deleted file mode 100644
index 64ab7c8..0000000
--- a/evolution/vFolder_from_message_subject.py
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Khasim Shaheed <sshaik@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-
-#Create and Verify vFolder from Message on Subject
-import string, time
-
-#Create vFolder
-def create_vFolder (index, vFolder_name):
-	try:
-		click ('Evolution-Mail', 'tbtnMail')
-		time.sleep (2)
-		selectrow ('Evolution-Mail', 'treeTabFolder', 'Mailbox')
-		selectrowindex ('Evolution-Mail', 'treetblMails', index)
-		selectmenuitem ('Evolution-Mail', 'mnuTools;mnuCreatevFolderFromMessage;mnuvFolderonSubject')
-		settextvalue('dlgNewvFolder', 'txtRuleName', vFolder_name)
-		click ('dlgNewvFolder', 'btnOK')
-		log ('Create vFolder from Message on Subject', 'pass')
-	except:
-		log ('Create vFolder from Message on Subject', 'fail')
-
-#Verify vFolder
-def verify_vFolder (index, folder_name):
-	try:
-		selectrow ('Evolution-Mail', 'treeTabFolder', 'Mailbox')
-		vFolder_mail_count = 0
-		subject = getcellvalue ('Evolution-Mail', 'treetblMails', index, 4)
-		total_mail_count = getrowcount ('Evolution-Mail', 'treetblMails')
-		for i in range (0, total_mail_count):
-			temp_subject = getcellvalue ('Evolution-Mail', 'treetblMails', i, 4)
-			if (string.find (temp_subject, subject) >= 0):
-				vFolder_mail_count = vFolder_mail_count + 1
-		selectrow ('Evolution-Mail', 'treeTabFolder', folder_name)
-		time.sleep (2)
-		folder_mail_count = getrowcount ('Evolution-Mail', 'treetblMails')
-		if (vFolder_mail_count == folder_mail_count):
-			log ('Verify vFolder from Message Subject', 'pass')
-		else:
-			log ('Verify vFolder from Message Subject', 'fail')
-	except:
-		log ('Verify vFolder from Message Subject', 'fail')
-
-#Getting the data from a file				
-file = open('vFolder_message_on_subject.dat', 'r')
-argmts = file.readlines()
-index = int (argmts[1].strip( ))
-vFolder_name = argmts[2].strip( )
-
-#Calling the functions
-log ('Create and Verify vFolder from Message on Subject', 'teststart')
-log ('Create vFolder from Message on Subject', 'teststart')
-create_vFolder(index, vFolder_name)
-log ('Create vFolder from Message on Subject', 'testend')
-log ('Verify vFolder from Message on Subject', 'teststart')
-verify_vFolder (index, vFolder_name)
-log ('Verify vFolder from Message on Subject', 'testend')
-log ('Create and Verify vFolder from Message on Subject', 'testend')
-
diff --git a/evolution/vFolder_message_on_mailinglist.dat b/evolution/vFolder_message_on_mailinglist.dat
deleted file mode 100644
index eadb40d..0000000
--- a/evolution/vFolder_message_on_mailinglist.dat
+++ /dev/null
@@ -1,3 +0,0 @@
-junk
-2
-vf_mailinglist
diff --git a/evolution/vFolder_message_on_recipients.dat b/evolution/vFolder_message_on_recipients.dat
deleted file mode 100644
index 86732fe..0000000
--- a/evolution/vFolder_message_on_recipients.dat
+++ /dev/null
@@ -1,4 +0,0 @@
-junk	
-2
-vf_recipients
-ldtp@scooby.net
diff --git a/evolution/vFolder_message_on_sender.dat b/evolution/vFolder_message_on_sender.dat
deleted file mode 100644
index 0ef95c3..0000000
--- a/evolution/vFolder_message_on_sender.dat
+++ /dev/null
@@ -1,3 +0,0 @@
-junk	
-2
-vf_sender
diff --git a/evolution/vFolder_message_on_subject.dat b/evolution/vFolder_message_on_subject.dat
deleted file mode 100644
index c272b77..0000000
--- a/evolution/vFolder_message_on_subject.dat
+++ /dev/null
@@ -1,3 +0,0 @@
-junk
-2
-vf_subject
diff --git a/evolution/verify-appointment.py b/evolution/verify-appointment.py
deleted file mode 100644
index ca9fc37..0000000
--- a/evolution/verify-appointment.py
+++ /dev/null
@@ -1,120 +0,0 @@
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Sheetal <svnayak18@yahoo.com>
-#     Prem <jpremkumar@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-#To create a Meeting
-
-#Reading inputs from file
-file = open ('create-appointment.dat','r')
-data = file.readlines ()
-summary = data[0].strip ()
-location = data[1].strip ()
-description = data[2].strip ()
-classification = data[3].strip ()
-categories = data[4].strip ()
-moncount = data[5].strip ()
-on = data[6].strip ()
-day = data[7].strip ()
-occurences = data[8].strip ()
-exception = data[9].strip ()
-
-#TODO: INCLUDE actual date values after fixing the problem in insert_appointment
-date0 = 0
-time0 = 0
-date1 = 0
-time1 = 0
-
-#setting up default values
-if classification == '$':
-    classification = 'Public'
-if categories == '$':
-    categories = 'Business'
-if moncount == '$':
-    moncount = '3'
-if on == '$':
-    on = 'First'
-if day == '$':
-    day = 'Monday'
-if occurences == '$':
-    occurences = '5'
-if exception =='$' or exception > occurences:
-    if exception > occurences:
-        log ('Setting exception to default value since given value is inappropriate', 'warning')
-    exception = 2
-
-#creation fo meeting
-log ('Appointment Verification', 'teststart')
-
-try:
-    if guiexist ('evolution') == 0:
-	log ('Evolution wondow not found', 'cause')
-	raise LdtpExecutionError (0)
-    else:
-	selectmenuitem ('evolution', 'mnuView;mnuWindow;mnuCalendars')
-    	time.sleep (2)
-	#selectmenuitem ('evolution', 'mnuView;mnuCurrentView;mnuListView')
-	#time.sleep (2)
-        if selectrow ('evolution', 'tbl0', summary) == 0:
-            log ('Selection of table value failed', 'cause')
-            raise LdtpExecutionError (0)
-        time.sleep (3)
-	typekey ('<ctrl>o')
-	time.sleep (2)
-	setcontext ('Appointment - No Summary', 'Appointment - '+summary)
-        time.sleep (2)
-	if guiexist ('dlgAppointment-Nosummary') == 0:
-	    log ('Failed to open Corresponding Appointment dialog', 'cause')
-	    raise LdtpExecutionError (0)
-	else:
-	    windowname = 'dlgAppointment-Nosummary'
-	    ptlistname = 'ptlAppointment'
-            if verifysettext (windowname, 'txtLocation', location) == 0:
-                log ('Verification of location field failed', 'cause')
-                raise LdtpExecutionError (0)
-            else:
-                if verifysettext (windowname, 'txt0', categories) == 0:
-                    log ('Verification of category field failed', 'cause')
-                    raise LdtpExecutionError (0)
-                else:
-                    if verifysettext (windowname, 'txtEventDescription', description) == 0:
-                        log ('Verification of description field failed', 'cause')
-                        raise LdtpExecutionError (0)
-                    else:
-                        #TODO: Include verification of combo boxes and check boxes after the bugs in them
-                        #are fixed
-                        click (windowname, 'btnCancel')
-                        time.sleep (2)
-                        log ('Ignore the following error message, Because of Guiexist usage', 'info')
-                        if guiexist (windowname) == 1:
-                            log ('Failed to close Appointment Dialog', 'cause')
-                            releasecontext ()
-                            raise LdtpExecutionError (0)
-                        else:
-                            log ('Verification of Appointment Succeeded','Pass')
-                            releasecontext ()
-except error,msg:
-    releasecontext ()
-    print 'Verification of Appointment failed' + str(msg)
-    log ('Verification of Appointment failed', 'error')
-    
-log ('Appointment Verification', 'testend')
diff --git a/evolution/verify-meeting.py b/evolution/verify-meeting.py
deleted file mode 100644
index d4becaa..0000000
--- a/evolution/verify-meeting.py
+++ /dev/null
@@ -1,122 +0,0 @@
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Sheetal <svnayak18@yahoo.com>
-#     Prem <jpremkumar@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This test script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-#To create a Meeting
-
-#Reading inputs from file
-file = open ('create-meeting.dat','r')
-data = file.readlines ()
-summary = data[0].strip ()
-location = data[1].strip ()
-description = data[2].strip ()
-classification = data[3].strip ()
-categories = data[4].strip ()
-moncount = data[5].strip ()
-on = data[6].strip ()
-day = data[7].strip ()
-occurences = data[8].strip ()
-exception = data[9].strip ()
-
-#TODO: INCLUDE actual date values after fixing the problem in insert_appointment
-date0 = 0
-time0 = 0
-date1 = 0
-time1 = 0
-
-#setting up default values
-if classification == '$':
-    classification = 'Public'
-if categories == '$':
-    categories = 'Business'
-if moncount == '$':
-    moncount = '3'
-if on == '$':
-    on = 'First'
-if day == '$':
-    day = 'Monday'
-if occurences == '$':
-    occurences = '5'
-if exception =='$' or exception > occurences:
-    if exception > occurences:
-        log ('Setting exception to default value since given value is inappropriate', 'warning')
-    exception = 2
-
-#creation fo meeting
-log ('Meeting Verification', 'teststart')
-
-try:
-    if guiexist ('evolution') == 0:
-	log ('Evolution window not found', 'cause')
-	raise LdtpExecutionError (0)
-    else:
-	selectmenuitem ('evolution', 'mnuView;mnuWindow;mnuCalendars')
-    	time.sleep (2)
-        print 'Summary ' + summary
-	#selectmenuitem ('evolution', 'mnuView;mnuCurrentView;mnuListView')
-	#time.sleep (2)
-        if selectrow ('evolution', 'tbl0', summary) == 0:
-            log ('Selection of table value failed', 'cause')
-            raise LdtpExecutionError (0)
-        time.sleep (2)
-        print 'comes here'
-        time.sleep (3)
-	typekey ('<ctrl>o')
-	time.sleep (2)
-	setcontext ('Meeting - No Summary', 'Meeting - '+summary)
-	if guiexist ('dlgMeeting-Nosummary') == 0:
-	    log ('Failed to open Corresponding meeting dialog', 'cause')
-	    raise LdtpExecutionError (0)
-	else:
-	    windowname = 'dlgMeeting-Nosummary'
-	    ptlistname = 'ptlMeeting'
-            if verifysettext (windowname, 'txtLocation', location) == 0:
-                log ('Verification of location field failed', 'cause')
-                raise 
-            else:
-                if verifysettext (windowname, 'txt0', categories) == 0:
-                    log ('Verification of category field failed', 'cause')
-                    raise 
-                else:
-                    if verifysettext (windowname, 'txtEventDescription', description) == 0:
-                        log ('Verification of description field failed', 'cause')
-                        raise 
-                    else:
-                        #TODO: Include verification of combo boxes and check boxes after the bugs in them
-                        #are fixed
-                        click (windowname, 'btnCancel')
-                        time.sleep (2)
-                        log ('Ignore the following error message, Because of Guiexist usage', 'info')
-                        if guiexist (windowname) == 1:
-                            log ('Failed to close Meeting Dialog', 'cause')
-                            releasecontext ()
-                            raise LdtpExecutionError (0)
-                        else:
-                            log ('Verification of Meeting Succeded','Pass')
-                            releasecontext ()
-except error,msg:
-    releasecontext ()
-    print 'Verification of meeting failed' + str(msg)
-    log ('Verification of meeting failed', 'error')
-  
-log ('Meeting Verification', 'testend')
diff --git a/evolution/view-mail.dat b/evolution/view-mail.dat
deleted file mode 100644
index e76c451..0000000
--- a/evolution/view-mail.dat
+++ /dev/null
@@ -1,3 +0,0 @@
-Inbox
--1
-IMAGES/viewmail_refimg.png
\ No newline at end of file
diff --git a/evolution/view-mail.py b/evolution/view-mail.py
deleted file mode 100644
index 7e89a99..0000000
--- a/evolution/view-mail.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/python
-#
-#  Linux Desktop Testing Project http://www.gnomebangalore.org/ldtp
-#
-#  Author:
-#     Nagashree <mnagashree@novell.com>
-#     Premkumar <jpremkumar@novell.com>
-#
-#  Copyright 2004 Novell, Inc.
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
-#
-#  You should have received a copy of the GNU Library General Public
-#  License along with this library; if not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-
-#To view mail
-def view_mail (folder_name, i, ref_image):
-    try:
-        time.sleep (5)
-        verifymailwithimage (folder_name, i, ref_image)
-    except:
-        log ('View mail failed', 'error')
-        raise LdtpExecutionError (0)
-    
-#Reading inputs from file
-file = open ('view-mail.dat','r')
-argmts = file.readlines()
-folder_name = argmts[0].strip()
-i = argmts[1].strip()
-ref_image = argmts[2].strip()
-
-log ('View mail verification','teststart')
-time.sleep(2)
-view_mail (folder_name, i, ref_image)
-time.sleep(2)
-log ('View mail verification','testend')