diff --git a/ui/ChangeLog b/ui/ChangeLog
index aabfec1153..df6942c02a 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-14  Srinivasa Ragavan <sragavan@novell.com>
+
+	* Makefile.am: Added two ui files evolution-editor.xml
+	and evolution-event-editor.xml.
+
 2005-11-10  Sankar P  <psankar@novell.com>
 
 	* evolution-mail-message.xml: added keyboard accelerators for 
diff --git a/ui/evolution-editor.xml b/ui/evolution-editor.xml
new file mode 100644
index 0000000000..4837bba55f
--- /dev/null
+++ b/ui/evolution-editor.xml
@@ -0,0 +1,66 @@
+<Root>
+  <commands>
+	  <cmd name="FileSave" _tip="Click here to save the current window" accel="*Control*s" pixtype="stock" pixname="gtk-save"/>
+	  <cmd name="FileClose" _tip="Click here to close the current window" accel="*Control*w" pixtype="stock" pixname="gtk-close"/>
+	  
+    	  <cmd name="EditCut" _tip="Cut selected text to the clipboard" accel="*Control*x" pixtype="stock" pixname="gtk-cut"/>
+	  <cmd name="EditCopy" _tip="Copy selected text to the clipboard" accel="*Control*c" pixtype="stock" pixname="gtk-copy"/>
+	  <cmd name="EditPaste" _tip="Paste text from the clipboard" accel="*Control*v" pixtype="stock" pixname="gtk-paste"/>
+	  <cmd name="EditSelectAll" _tip="Select all text" accel="*Control*a"/>
+
+	  <cmd name="InsertAttachment" _tip="Click here to attach a file" accel="*Control**Alt*a" pixtype="pixbuf"/>
+	  <cmd name="Help" _tip="Click here to view help availabe" accel="*Control*h" pixtype="stock" pixname="gtk-help"/>
+	  
+	  
+  </commands>
+
+  <menu>
+    <submenu name="File" _label="_File">
+      <placeholder name="FileOps">
+        <menuitem name="FileSave" verb="" _label="_Save"/>
+      </placeholder>
+      <placeholder name="FileWindow">
+	<menuitem name="FileClose" verb="" _label="_Close"/>
+      </placeholder>
+    </submenu>
+
+    <submenu name="Edit" _label="_Edit">
+	<placeholder name="EditCutCopyPaste">
+          <menuitem name="EditCut" verb="" _label="Cu_t"/>
+          <menuitem name="EditCopy" verb="" _label="_Copy"/>
+          <menuitem name="EditPaste" verb="" _label="_Paste"/>
+          <separator/>
+	  <menuitem name="EditSelectAll" verb="" _label="Select _All"/>
+        </placeholder>
+    </submenu>
+
+    <submenu name="View" _label="_View">
+    </submenu>
+
+    <submenu name="Insert" _label="_Insert">
+      <placeholder name="Attachments">
+	      <menuitem name="InsertAttachments" verb="" _label="_Attachments" pixtype="pixbuf"/>
+	<separator f="" name="attach"/>
+      </placeholder>
+     </submenu>
+
+    <submenu name="Options" _label="_Options">
+    </submenu>
+
+    <submenu name="Help" _label="_Help">
+	<menuitem name="Help" verb="" _label="_Help"/>
+    </submenu>
+  </menu>
+
+  <dockitem name="Toolbar">
+  
+    <toolitem name="FileSave" verb="" _label="Save"/>
+    <toolitem name="FileClose" verb="" _label="Close"/>
+    <separator f="" name="editor1"/>
+
+    <toolitem name="InsertAttachments" verb="" _label="Attachments" pixtype="pixbuf"/>
+    <separator f="" name="ecal3"/>
+
+  </dockitem>
+
+</Root>
diff --git a/ui/evolution-event-editor.xml b/ui/evolution-event-editor.xml
new file mode 100644
index 0000000000..addb75bf15
--- /dev/null
+++ b/ui/evolution-event-editor.xml
@@ -0,0 +1,95 @@
+<Root>
+	<commands>
+                <cmd name="ViewAttendee" _label="_Attendee"
+		_tip="Toggles whether the Attendee field is displayed"
+		type="toggle" state="0"/>
+
+                <cmd name="ViewRole" _label="R_ole Field"
+		_tip="Toggles whether the Role field is displayed"
+		type="toggle" state="0"/>
+		
+		<cmd name="ViewRSVP" _label="_RSVP"
+		_tip="Toggles whether the RSVP field is displayed"
+		type="toggle" state="0"/>
+			    
+		<cmd name="ViewType" _label="_Type Field"
+		_tip="Toggles whether the Attendee Type field is displayed"
+		type="toggle" state="0"/>		
+
+		<cmd name="ViewStatus" _label="_Status Field"
+		_tip="Toggles whether the Status field is displayed"
+		type="toggle" state="0"/>
+
+		<cmd name="ViewTimeZone" _label="Show Time _Zone"
+		_tip="Toggles whether the time zone is displayed"
+		type="toggle" state="0" pixtype="pixbuf"/>	
+	
+		<cmd name="ActionShowTimeBusy" _label="Show time as b_usy"
+		_tip="Toggles whether to show time as busy"
+		type="toggle" state="0"/>	
+	
+		<cmd name="ActionAllDayEvent" _label="_All day Event"
+		_tip="Toggles whether to have All day Event"
+		type="toggle" state="0" pixtype="pixbuf"/>	
+
+		<cmd name="ViewCategories" _label="_Categories"
+		_tip="Toggles whether to display categories"
+		type="toggle" state="0"/>
+
+    		<cmd name="ActionClassPublic" _label="Pu_blic" 
+      		type="radio" group="class" _tip="Classify as public"/>
+
+ 	 	<cmd name="ActionClassPrivate" _label="_Private" 
+      		type="radio" group="class" _tip="Classify as Private"/>
+
+    		<cmd name="ActionClassConfidential" _label="_Confidential" 
+		type="radio" group="class" _tip="Classify as Confidential"/>
+
+		<cmd name="ActionRecurrance" _label="Recurrance"
+		_tip="Make this a recurring event" pixtype="pixbuf"/>
+		<cmd name="ActionFreeBusy" _label="Free/Busy"
+		_tip="Query free / busy information for the attendees" pixtype="pixbuf"/>
+		<cmd name="InsertSendOptions" _label="Send Options"
+		_tip="Insert advanced send options"/>
+	</commands>
+	
+
+  <menu>
+    <submenu name="View">
+      <placeholder name="AttendeeOptions">
+      	<menuitem name="ViewAttendee" verb=""/>
+      	<menuitem name="ViewType" verb="" />
+	<menuitem name="ViewStatus" verb="" />
+      	<menuitem name="ViewRole" verb="" />
+	<menuitem name="ViewRSVP" verb="" />
+        <separator f="" name="timezonesep"/>	
+	<menuitem name="ViewTimeZone" verb=""/>
+	<menuitem name="ViewCategories" verb=""/>	
+      </placeholder>
+    </submenu>
+    <submenu  name="Insert">
+	    <menuitem name="InsertSendOptions" verb="" _label="Send Options"/>	    
+    </submenu>
+    <submenu name="Options">
+	    <menuitem name="ActionAlarm" verb="" _label="_Alarms" pixtype="pixbuf"/>
+	    <menuitem name="ActionShowTimeBusy" verb="" _label="Show time as b_usy"/>
+	    <menuitem name="ActionAllDayEvent" verb="" _label="_All day Event"/>
+	    <submenu name="Classification" _label="_Classification">
+		    <menuitem name="ActionClassPublic" id="ActionClassPublic" verb=""/>
+		    <menuitem name="ActionClassPrivate" id="ActionClassPrivate" verb=""/>
+		    <menuitem name="ActionClassConfidential" id="ActionClassConfidential" verb=""/>
+	    </submenu>
+	    <menuitem name="ActionRecurrance" verb="" _label="Recurrance" pixtype="pixbuf"/>
+	    <menuitem name="ActionFreeBusy" verb="" _label="Free/Busy"/>	    
+    </submenu>
+  </menu>
+
+  <dockitem name="Toolbar">
+	  <toolitem name="ActionAlarm" verb="" _label="Alarms" pixtype="pixbuf" />
+	  <toolitem name="ActionAllDayEvent" verb="" _label="All day Event" pixtype="pixbuf"/>
+	  <toolitem name="ViewTimeZone" verb="" _label="Time Zone" pixtype="pixbuf"/>	  
+	  <toolitem name="ActionRecurrance" verb="" _label="Recurrance" pixtype="pixbuf"/>	
+	  <toolitem name="ActionFreeBusy" verb="" _label="Free/Busy" pixtype="pixbuf"/>	  	  	  
+  </dockitem>
+
+</Root>