diff --git a/RIGS/templates/RIGS/version_changes.html b/RIGS/templates/RIGS/version_changes.html
index 33f8c839..bbd15695 100644
--- a/RIGS/templates/RIGS/version_changes.html
+++ b/RIGS/templates/RIGS/version_changes.html
@@ -2,8 +2,8 @@
 
 	<button title="Changes to {{ change.field.verbose_name }}" type="button" class="btn btn-default btn-xs" data-container="body" data-html="true" data-trigger='hover' data-toggle="popover" data-content='
 
-    	{% if change.new %}<div class="alert alert-success">{{change.new|linebreaksbr}}</div>{% endif %}
-    	{% if change.old %}<div class="alert alert-danger">{{change.old|linebreaksbr}}</div>{% endif %}
+    	{% if change.new %}<div class="alert alert-success {% if change.long %}overflow-ellipsis{% endif %}">{{change.new|linebreaksbr}}</div>{% endif %}
+    	{% if change.old %}<div class="alert alert-danger {% if change.long %}overflow-ellipsis{% endif %}">{{change.old|linebreaksbr}}</div>{% endif %}
     	
         '>{{ change.field.verbose_name }}</button>
 
diff --git a/RIGS/versioning.py b/RIGS/versioning.py
index e1e96793..9fd815b4 100644
--- a/RIGS/versioning.py
+++ b/RIGS/versioning.py
@@ -16,7 +16,7 @@ import simplejson
 from reversion.models import Version
 from django.contrib.contenttypes.models import ContentType # Used to lookup the content_type
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
-from django.db.models import ForeignKey, IntegerField
+from django.db.models import ForeignKey, IntegerField, EmailField
 
 from RIGS import models, forms
 import datetime
@@ -50,7 +50,13 @@ def model_compare(oldObj, newObj, excluded_keys=[]):
 
         @property
         def new(self):
-            return self.display_value(self._new)        
+            return self.display_value(self._new)   
+
+        @property
+        def long(self):
+            if isinstance(self.field, EmailField):
+                return True
+            return False     
 
     changes = []