diff --git a/app/models/fetprofile.rb b/app/models/fetprofile.rb
index a83834c..33a720d 100644
--- a/app/models/fetprofile.rb
+++ b/app/models/fetprofile.rb
@@ -26,6 +26,6 @@ class Fetprofile < ActiveRecord::Base
   accepts_nested_attributes_for :memberships
   scope :active, -> { where(:active=>true).order(:vorname) } 
   def fetmail
-    (fetmailalias.nil? || fetmail.empty?) ? short.to_s + "@fet.at" : fetmailalias.to_s + "@fet.at"
+    (fetmailalias.nil? || fetmailalias.empty?) ? short.to_s + "@fet.at" : fetmailalias.to_s + "@fet.at"
   end
 end
diff --git a/app/views/fetprofiles/index.html.erb b/app/views/fetprofiles/index.html.erb
index 080f97c..357646e 100644
--- a/app/views/fetprofiles/index.html.erb
+++ b/app/views/fetprofiles/index.html.erb
@@ -1,32 +1,47 @@
 
 <%= render 'fetprofiles/tabs' %>
+
 <h1>
   <%=	I18n.t 'fetprofiles.all' if params[:filter] == "all" %>
   <%=	I18n.t 'fetprofiles.active' if params[:filter].nil? || params[:filter]== "active"
 	%>
 </h1>
+
 <ul class="unstyled fetprofile_list">
+
   <% @fetprofiles.each do |fetprofile| %>
   <li>
+
     <%= link_to fetprofile do %>
     <div class="media">
+
       <span class="pull-left">
-	<%= image_tag fetprofile.picture.portrait.url %>
+	<%=  image_tag fetprofile.picture.portrait.url %>
       </span>
+
       <div class="media-body">  
 	<h2><%= fetprofile.name %></h2>
+
 	<p><%= fetprofile.fetmail %></p>
+<% if false %>
 	<p><%= fetprofile.desc %></p>
+<% end %>
   
       </div>
+
     </div>
     <% end %>
+
   </li>
   <% end %>
+
 </ul>
+
 <div class="row-fluid">
   <div class="span12">
     <%= link_to I18n.t('fetprofiles.new'), new_fetprofile_path %>
   </div>
 </div>
 </div>
+
+