diff --git a/legacy/edje/AUTHORS b/legacy/edje/AUTHORS
index 3377d78d0c..34ce0fa31f 100644
--- a/legacy/edje/AUTHORS
+++ b/legacy/edje/AUTHORS
@@ -23,3 +23,4 @@ Prince Kumar Dubey <prince.dubey@samsung.com> <prince.dubey@gmail.com>
 David Seikel <onefang at gmail.com>
 Mikael Sans <sans.mikael@gmail.com>
 Jérôme Pinot <ngc891@gmail.com>
+Rajeev Ranjan (Rajeev) <rajeev.r@samsung.com> <rajeev.jnnce@gmail.com>
diff --git a/legacy/edje/ChangeLog b/legacy/edje/ChangeLog
index 59e6842b22..5fc6a4d3d6 100644
--- a/legacy/edje/ChangeLog
+++ b/legacy/edje/ChangeLog
@@ -438,3 +438,10 @@
 2012-05-10  Cedric Bail
 
 	* Preserve user box and table items during call of edje_object_file_set.
+
+2012-04-30  Rajeev Ranjan (Rajeev)
+
+	* Add edje_cc optimization to remove alpha channel flag from images
+        with absolutely no alpha in them if marked as havin alpha in the
+        originals
+
diff --git a/legacy/edje/src/bin/edje_cc_out.c b/legacy/edje/src/bin/edje_cc_out.c
index f3b4358e32..fe72c5e0c0 100644
--- a/legacy/edje/src/bin/edje_cc_out.c
+++ b/legacy/edje/src/bin/edje_cc_out.c
@@ -566,6 +566,8 @@ data_write_images(Eet_File *ef, int *image_num, int *input_bytes, int *input_raw
 		       int  im_w, im_h;
 		       int  im_alpha;
 		       char buf[256];
+		       unsigned int  *start, *end;
+		       Eina_Bool opaque = EINA_TRUE;
 
 		       evas_object_image_size_get(im, &im_w, &im_h);
 		       im_alpha = evas_object_image_alpha_get(im);
@@ -605,6 +607,21 @@ data_write_images(Eet_File *ef, int *image_num, int *input_bytes, int *input_raw
 				 if (qual < min_quality) qual = min_quality;
 				 if (qual > max_quality) qual = max_quality;
 			      }
+			    if (im_alpha)
+			      {
+			         start = (unsigned int *) im_data;
+			         end = start + (im_w * im_h);
+			         while (start < end)
+			           {
+			              if ((*start & 0xff000000) != 0xff000000)
+			                {
+			                   opaque = EINA_FALSE;
+			                   break;
+			                }
+			              start++;
+			           }
+			         if (opaque) im_alpha = 0;
+			      }
 			    if (mode == 0)
 			      bytes = eet_data_image_write(ef, buf,
 							   im_data, im_w, im_h,