diff --git a/ws/eclipse/HibIntro/src/main/java/component/emails/Email.java b/ws/eclipse/HibIntro/src/main/java/component/emails/Email.java
index 9c0bb14876edd25e30be7b2afb906f06281415c9..bb486baf0789eb05f5eea5e50c86429e70b2cc26 100644
--- a/ws/eclipse/HibIntro/src/main/java/component/emails/Email.java
+++ b/ws/eclipse/HibIntro/src/main/java/component/emails/Email.java
@@ -13,7 +13,25 @@ public class Email {
   public Email(final String emailAddress) {
     setEmailAddress(emailAddress);
   }
-  void sendEmail(final String subject, final String content) {
-    //Not yet implemented
+  @Override
+  public int hashCode() {
+    if (null == getEmailAddress()) {
+      return System.identityHashCode(this);
+    } else {
+      return getEmailAddress().hashCode();
+    }
+  }
+  @Override
+  public boolean equals(Object obj) {
+    if (null == getEmailAddress()) {
+      return false;
+    } else if ( null == obj) {
+      return false;
+    } else if (obj instanceof Email) {
+      Email other = (Email) obj;
+      return getEmailAddress().equals(other.getEmailAddress());
+    } else {
+      return false;
+    }
   }
 }
\ No newline at end of file