Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/events/Subscription.hbm.xml
===================================================================
diff -u -r6e4ed3724bd76354c2ee43c88979385c4a162a0e -rd0297b87cb5cfb713673b3f7903722d0d96adfef
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/events/Subscription.hbm.xml	(.../Subscription.hbm.xml)	(revision 6e4ed3724bd76354c2ee43c88979385c4a162a0e)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/events/Subscription.hbm.xml	(.../Subscription.hbm.xml)	(revision d0297b87cb5cfb713673b3f7903722d0d96adfef)
@@ -49,6 +49,19 @@
             column="user_id"
         />
 
+        <many-to-one
+            name="event"
+            class="org.lamsfoundation.lams.events.Event"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+        >
+            <column
+                name="event_uid" 
+            />
+        </many-to-one>
+
         <property
             name="deliveryMethodId"
             type="java.lang.Short"
Index: lams_common/src/java/org/lamsfoundation/lams/events/Subscription.java
===================================================================
diff -u -rdab2e119700d02ac373e69b7c3afeeadf1f21d56 -rd0297b87cb5cfb713673b3f7903722d0d96adfef
--- lams_common/src/java/org/lamsfoundation/lams/events/Subscription.java	(.../Subscription.java)	(revision dab2e119700d02ac373e69b7c3afeeadf1f21d56)
+++ lams_common/src/java/org/lamsfoundation/lams/events/Subscription.java	(.../Subscription.java)	(revision d0297b87cb5cfb713673b3f7903722d0d96adfef)
@@ -24,6 +24,8 @@
 	 * ID of the subscribed user
 	 */
 	protected Long userId;
+	
+	protected Event event;
 
 	/**
 	 * ID of the delivery method used to send a message for this subscription.
@@ -125,6 +127,19 @@
 		return userId;
 	}
 
+	/**
+	 * @hibernate.many-to-one
+	 * @hibernate.column name="event_uid"
+	 * @return
+	 */
+	public Event getEvent() {
+		return event;
+	}
+
+	public void setEvent(Event event) {
+		this.event = event;
+	}
+
 	@Override
 	public int hashCode() {
 		return new HashCodeBuilder().append(getUserId()).append(getDeliveryMethod()).toHashCode();
Index: lams_common/src/java/org/lamsfoundation/lams/events/dao/hibernate/EventDAOHibernate.java
===================================================================
diff -u -r2f21856ec2ab85b47c93cfcc3fa2c8769be65077 -rd0297b87cb5cfb713673b3f7903722d0d96adfef
--- lams_common/src/java/org/lamsfoundation/lams/events/dao/hibernate/EventDAOHibernate.java	(.../EventDAOHibernate.java)	(revision 2f21856ec2ab85b47c93cfcc3fa2c8769be65077)
+++ lams_common/src/java/org/lamsfoundation/lams/events/dao/hibernate/EventDAOHibernate.java	(.../EventDAOHibernate.java)	(revision d0297b87cb5cfb713673b3f7903722d0d96adfef)
@@ -13,8 +13,8 @@
 	    + " AS e WHERE e.scope=? AND e.name=? AND e.eventSessionId=? AND e.failTime IS NULL";
 
     protected static final String GET_EVENTS_TO_RESEND_QUERY = "SELECT DISTINCT e FROM " + Event.class.getName()
-	    + " AS e LEFT JOIN FETCH e.subscriptions AS s WHERE e.failTime IS NOT NULL OR "
-	    + "(s.periodicity > 0 AND (NOW()- s.lastOperationTime >= s.periodicity))";
+	    + " AS e, Subscription AS s WHERE s.event = e AND (e.failTime IS NOT NULL OR "
+	    + "(s.periodicity > 0 AND (NOW()- s.lastOperationTime >= s.periodicity)))";
 
     public Event getEvent(String scope, String name, Long sessionId) throws InvalidParameterException {
 	List<Event> events = getHibernateTemplate().find(EventDAOHibernate.GET_EVENT_QUERY,